incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r592659 - in /incubator/sling/trunk: maven/maven-sling-plugin/ maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/ microsling/microsling-core/ microsling/microsling-core/src/main/java/org/apache/sling/microsling/res...
Date Wed, 07 Nov 2007 09:04:05 GMT
Author: cziegeler
Date: Wed Nov  7 01:04:05 2007
New Revision: 592659

URL: http://svn.apache.org/viewvc?rev=592659&view=rev
Log:
Remove unused imports and use latest rhino, httpclient and jruby.

Modified:
    incubator/sling/trunk/maven/maven-sling-plugin/pom.xml
    incubator/sling/trunk/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundlePostMojo.java
    incubator/sling/trunk/microsling/microsling-core/pom.xml
    incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/resource/MicroslingResourceResolver.java

Modified: incubator/sling/trunk/maven/maven-sling-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/maven/maven-sling-plugin/pom.xml?rev=592659&r1=592658&r2=592659&view=diff
==============================================================================
--- incubator/sling/trunk/maven/maven-sling-plugin/pom.xml (original)
+++ incubator/sling/trunk/maven/maven-sling-plugin/pom.xml Wed Nov  7 01:04:05 2007
@@ -69,7 +69,7 @@
         <dependency>
             <groupId>commons-httpclient</groupId>
             <artifactId>commons-httpclient</artifactId>
-            <version>3.0.1</version>
+            <version>3.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

Modified: incubator/sling/trunk/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundlePostMojo.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundlePostMojo.java?rev=592659&r1=592658&r2=592659&view=diff
==============================================================================
--- incubator/sling/trunk/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundlePostMojo.java
(original)
+++ incubator/sling/trunk/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundlePostMojo.java
Wed Nov  7 01:04:05 2007
@@ -24,7 +24,6 @@
 import java.util.jar.Manifest;
 
 import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
 
 abstract class AbstractBundlePostMojo extends AbstractMojo {
 
@@ -38,7 +37,7 @@
      * This method may also be used to check whether the file is a bundle at all
      * as it is assumed, that only if the file contains an OSGi bundle will the
      * <code>Bundle-SymbolicName</code> manifest header be set.
-     * 
+     *
      * @param jarFile The file providing the bundle whose symbolic name is
      *            requested.
      * @return The bundle's symbolic name from the

Modified: incubator/sling/trunk/microsling/microsling-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/microsling/microsling-core/pom.xml?rev=592659&r1=592658&r2=592659&view=diff
==============================================================================
--- incubator/sling/trunk/microsling/microsling-core/pom.xml (original)
+++ incubator/sling/trunk/microsling/microsling-core/pom.xml Wed Nov  7 01:04:05 2007
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby-complete</artifactId>
-      <version>1.0RC3</version>
+      <version>1.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.sling</groupId>
@@ -73,7 +73,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>3.8.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -105,7 +105,7 @@
     <dependency>
       <groupId>rhino</groupId>
       <artifactId>js</artifactId>
-      <version>1.6R6</version>
+      <version>1.6R7</version>
     </dependency>
     <dependency>
         <groupId>freemarker</groupId>

Modified: incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/resource/MicroslingResourceResolver.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/resource/MicroslingResourceResolver.java?rev=592659&r1=592658&r2=592659&view=diff
==============================================================================
--- incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/resource/MicroslingResourceResolver.java
(original)
+++ incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/resource/MicroslingResourceResolver.java
Wed Nov  7 01:04:05 2007
@@ -41,7 +41,6 @@
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ResourceMetadata;
 import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.velocity.exception.ResourceNotFoundException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -64,8 +63,7 @@
     /**
      * Resolves the Resource from the request
      */
-    public Resource resolve(ServletRequest request) throws SlingException,
-            ResourceNotFoundException {
+    public Resource resolve(ServletRequest request) throws SlingException {
         Resource result = null;
         String path = null;
         String pathInfo = ((HttpServletRequest) request).getPathInfo();



Mime
View raw message