Merge pull request #265 from sonatype/walk-fix2

Walking speed fix2
sonatype · Feb 6, 2012 · 08a3319 · 08a3319
2 parents 55f9cc1 + b78c1fc
commit 08a3319
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/nexus/nexus-proxy/pom.xml b/nexus/nexus-proxy/pom.xml
@@ -76,6 +76,12 @@
       <groupId>com.thoughtworks.xstream</groupId>
       <artifactId>xstream</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-mapper-asl</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
     <!-- Local and remote storage techs -->
     <dependency>
       <groupId>com.ning</groupId>
@@ -132,11 +138,11 @@
       <groupId>org.sonatype.sisu</groupId>
       <artifactId>sisu-charger</artifactId>
     </dependency>
-  <dependency>
-    <groupId>org.sonatype.sisu</groupId>
-    <artifactId>sisu-resource-scanner</artifactId>
-    <version>1.0</version>
-  </dependency>
+    <dependency>
+      <groupId>org.sonatype.sisu</groupId>
+      <artifactId>sisu-resource-scanner</artifactId>
+      <version>1.0</version>
+    </dependency>
 
     <!-- Testing -->
     <dependency>
@@ -178,13 +184,7 @@
       <artifactId>shiro-web</artifactId>
       <scope>test</scope>
     </dependency>
-
-    <!-- NEXUS-4628: Attributes perf tests, for now the "alternate" imples are in tests not getting into core -->
-    <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-mapper-asl</artifactId>
-      <scope>test</scope>
-    </dependency>
+    <!-- For the Jackson XML Marshaller that is slower than JSON and will remain in test to not pollute core -->
     <dependency>
       <groupId>com.fasterxml</groupId>
       <artifactId>jackson-xml-databind</artifactId>

diff --git a/...us-proxy/src/main/java/org/sonatype/nexus/proxy/attributes/DefaultLSAttributeStorage.java b/...us-proxy/src/main/java/org/sonatype/nexus/proxy/attributes/DefaultLSAttributeStorage.java
@@ -55,7 +55,7 @@ public class DefaultLSAttributeStorage
      * Instantiates a new FSX stream attribute storage.
      */
     @Inject
-    public DefaultLSAttributeStorage( @Named( "xstream-xml" ) final Marshaller marshaller )
+    public DefaultLSAttributeStorage( @Named( "jackson-json" ) final Marshaller marshaller )
     {
         this.marshaller = marshaller;
         getLogger().info( "Default LS AttributeStorage in place." );

diff --git a/...oxy/attributes/JacksonJSONMarshaller.java → ...oxy/attributes/JacksonJSONMarshaller.java b/...oxy/attributes/JacksonJSONMarshaller.java → ...oxy/attributes/JacksonJSONMarshaller.java
diff --git a/...t/java/org/sonatype/nexus/integrationtests/nexus636/Nexus636EvictUnusedProxiedTaskIT.java b/...t/java/org/sonatype/nexus/integrationtests/nexus636/Nexus636EvictUnusedProxiedTaskIT.java
@@ -158,7 +158,7 @@ private void executeTask( String taskName, String repository, int cacheAge )
 
     private Marshaller getMarshaller()
     {
-        return new XStreamMarshaller();
+        return new JacksonJSONMarshaller();
     }
 
     private void changeProxyAttributeDate( File attributeFile, int daysFromToday )

diff --git a/nexus/pom.xml b/nexus/pom.xml
@@ -756,19 +756,19 @@
       <dependency>
         <groupId>org.codehaus.jackson</groupId>
         <artifactId>jackson-core-asl</artifactId>
-        <version>1.9.2</version>
+        <version>1.9.4</version>
         <type>jar</type>
       </dependency>
       <dependency>
         <groupId>org.codehaus.jackson</groupId>
         <artifactId>jackson-mapper-asl</artifactId>
-        <version>1.9.2</version>
+        <version>1.9.4</version>
         <type>jar</type>
       </dependency>
       <dependency>
         <groupId>com.fasterxml</groupId>
         <artifactId>jackson-xml-databind</artifactId>
-        <version>0.6.1</version>
+        <version>0.6.2</version>
         <exclusions>
           <exclusion>
             <groupId>javax.xml.stream</groupId>