geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r945222 - in /geronimo/server/trunk: plugingroups/wab-jetty/ plugingroups/wab-jetty/src/main/history/ plugingroups/wab-tomcat/ plugingroups/wab-tomcat/src/main/history/ plugins/ plugins/remote-deploy/geronimo-remote-deploy/src/main/java/org...
Date Mon, 17 May 2010 15:53:02 GMT
Author: gawor
Date: Mon May 17 15:53:01 2010
New Revision: 945222

URL: http://svn.apache.org/viewvc?rev=945222&view=rev
Log:
get remote-plugin working

Modified:
    geronimo/server/trunk/plugingroups/wab-jetty/pom.xml
    geronimo/server/trunk/plugingroups/wab-jetty/src/main/history/dependencies.xml
    geronimo/server/trunk/plugingroups/wab-tomcat/pom.xml
    geronimo/server/trunk/plugingroups/wab-tomcat/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/pom.xml
    geronimo/server/trunk/plugins/remote-deploy/geronimo-remote-deploy/src/main/java/org/apache/geronimo/deployment/remote/FileUploadServlet.java
    geronimo/server/trunk/plugins/remote-deploy/remote-deploy-jetty/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/remote-deploy/remote-deploy-jetty/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/remote-deploy/remote-deploy-tomcat/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/remote-deploy/remote-deploy-tomcat/src/main/plan/plan.xml

Modified: geronimo/server/trunk/plugingroups/wab-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/wab-jetty/pom.xml?rev=945222&r1=945221&r2=945222&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/wab-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/wab-jetty/pom.xml Mon May 17 15:53:01 2010
@@ -93,12 +93,12 @@
             <version>${project.version}</version>
             <type>car</type>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.configs</groupId>-->
-            <!--<artifactId>remote-deploy-jetty</artifactId>-->
-            <!--<version>${project.version}</version>-->
-            <!--<type>car</type>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>remote-deploy-jetty</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper-deployer</artifactId>

Modified: geronimo/server/trunk/plugingroups/wab-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/wab-jetty/src/main/history/dependencies.xml?rev=945222&r1=945221&r2=945222&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/wab-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/wab-jetty/src/main/history/dependencies.xml Mon May
17 15:53:01 2010
@@ -33,6 +33,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>remote-deploy-jetty</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>web-extender</artifactId>
         <type>car</type>
     </dependency>

Modified: geronimo/server/trunk/plugingroups/wab-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/wab-tomcat/pom.xml?rev=945222&r1=945221&r2=945222&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/wab-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/wab-tomcat/pom.xml Mon May 17 15:53:01 2010
@@ -93,12 +93,12 @@
             <version>${project.version}</version>
             <type>car</type>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.configs</groupId>-->
-            <!--<artifactId>remote-deploy-tomcat</artifactId>-->
-            <!--<version>${project.version}</version>-->
-            <!--<type>car</type>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>remote-deploy-tomcat</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper-deployer</artifactId>

Modified: geronimo/server/trunk/plugingroups/wab-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/wab-tomcat/src/main/history/dependencies.xml?rev=945222&r1=945221&r2=945222&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/wab-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/wab-tomcat/src/main/history/dependencies.xml Mon May
17 15:53:01 2010
@@ -28,6 +28,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>remote-deploy-tomcat</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>tomcat7-deployer</artifactId>
         <type>car</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pom.xml?rev=945222&r1=945221&r2=945222&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pom.xml (original)
+++ geronimo/server/trunk/plugins/pom.xml Mon May 17 15:53:01 2010
@@ -184,7 +184,7 @@
         <module>uddi</module>
         <!--<module>mejb</module>-->
         <!--<module>monitoring</module>-->
-        <!--<module>remote-deploy</module>-->
+        <module>remote-deploy</module>
         <!--<module>sharedlib</module>-->
         <module>welcome</module>
         <!--<module>procrun</module>-->

Modified: geronimo/server/trunk/plugins/remote-deploy/geronimo-remote-deploy/src/main/java/org/apache/geronimo/deployment/remote/FileUploadServlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/remote-deploy/geronimo-remote-deploy/src/main/java/org/apache/geronimo/deployment/remote/FileUploadServlet.java?rev=945222&r1=945221&r2=945222&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/remote-deploy/geronimo-remote-deploy/src/main/java/org/apache/geronimo/deployment/remote/FileUploadServlet.java
(original)
+++ geronimo/server/trunk/plugins/remote-deploy/geronimo-remote-deploy/src/main/java/org/apache/geronimo/deployment/remote/FileUploadServlet.java
Mon May 17 15:53:01 2010
@@ -106,7 +106,11 @@ public class FileUploadServlet extends H
                     //File temp = File.createTempFile("remote-deploy", "");
                     // Note: Doing this because WAR files have to be their original names
to
                     // handle the case where no web.xml or context root was provided
-                    File temp = new File(System.getProperty("java.io.tmpdir"), fileName.trim());
+                    File tempDir = new File(System.getProperty("java.io.tmpdir"));      
             
+                    File temp = new File(tempDir, fileName.trim());
+                    if (!temp.getAbsolutePath().startsWith(tempDir.getAbsolutePath())) {
+                        throw new IOException("Invalid upload filename");               
        
+                    }
                     temp.createNewFile();
                     temp.deleteOnExit();
                     names[i] = temp.getAbsolutePath();

Modified: geronimo/server/trunk/plugins/remote-deploy/remote-deploy-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/remote-deploy/remote-deploy-jetty/src/main/history/dependencies.xml?rev=945222&r1=945221&r2=945222&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/remote-deploy/remote-deploy-jetty/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/remote-deploy/remote-deploy-jetty/src/main/history/dependencies.xml
Mon May 17 15:53:01 2010
@@ -12,13 +12,13 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>xmlbeans</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>geronimo-remote-deploy</artifactId>
         <type>war</type>
     </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/remote-deploy/remote-deploy-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/remote-deploy/remote-deploy-jetty/src/main/plan/plan.xml?rev=945222&r1=945221&r2=945222&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/remote-deploy/remote-deploy-jetty/src/main/plan/plan.xml
(original)
+++ geronimo/server/trunk/plugins/remote-deploy/remote-deploy-jetty/src/main/plan/plan.xml
Mon May 17 15:53:01 2010
@@ -20,6 +20,10 @@
 
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-${geronimoSchemaVersion}"
xmlns:sec="http://geronimo.apache.org/xml/ns/security-${geronimoSchemaVersion}" xmlns:cfg="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
 
+    <environment>
+        <export-package>org.apache.geronimo.deployment.remote</export-package>
+    </environment>
+
     <context-root>/remote-deploy</context-root>
     <security-realm-name>geronimo-admin</security-realm-name>
     <sec:security>

Modified: geronimo/server/trunk/plugins/remote-deploy/remote-deploy-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/remote-deploy/remote-deploy-tomcat/src/main/history/dependencies.xml?rev=945222&r1=945221&r2=945222&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/remote-deploy/remote-deploy-tomcat/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/remote-deploy/remote-deploy-tomcat/src/main/history/dependencies.xml
Mon May 17 15:53:01 2010
@@ -12,13 +12,13 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>xmlbeans</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>geronimo-remote-deploy</artifactId>
         <type>war</type>
     </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/remote-deploy/remote-deploy-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/remote-deploy/remote-deploy-tomcat/src/main/plan/plan.xml?rev=945222&r1=945221&r2=945222&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/remote-deploy/remote-deploy-tomcat/src/main/plan/plan.xml
(original)
+++ geronimo/server/trunk/plugins/remote-deploy/remote-deploy-tomcat/src/main/plan/plan.xml
Mon May 17 15:53:01 2010
@@ -20,6 +20,10 @@
 
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-${geronimoSchemaVersion}"
xmlns:sec="http://geronimo.apache.org/xml/ns/security-${geronimoSchemaVersion}" xmlns:cfg="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
 
+    <environment>
+        <export-package>org.apache.geronimo.deployment.remote</export-package>
+    </environment>
+
     <context-root>/remote-deploy</context-root>
     <security-realm-name>geronimo-admin</security-realm-name>
     <sec:security>



Mime
View raw message