geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r413963 - in /geronimo/trunk: applications/ applications/remote-deploy-lib/ applications/remote-deploy/ applications/remote-deploy/src/java/org/apache/geronimo/deployment/remote/ configs/remote-deploy-jetty/ configs/remote-deploy-tomcat/
Date Tue, 13 Jun 2006 19:34:41 GMT
Author: djencks
Date: Tue Jun 13 12:34:40 2006
New Revision: 413963

URL: http://svn.apache.org/viewvc?rev=413963&view=rev
Log:
GERONIMO-2098 merge remote-deploy-lib to remote-deploy, m2 build for remote-deploy

Added:
    geronimo/trunk/applications/remote-deploy/src/java/org/apache/geronimo/deployment/remote/RemoteDeployGBean.java
      - copied unchanged from r413322, geronimo/trunk/applications/remote-deploy-lib/src/java/org/apache/geronimo/deployment/remote/RemoteDeployGBean.java
    geronimo/trunk/applications/remote-deploy/src/java/org/apache/geronimo/deployment/remote/RemoteDeployToken.java
      - copied unchanged from r413322, geronimo/trunk/applications/remote-deploy-lib/src/java/org/apache/geronimo/deployment/remote/RemoteDeployToken.java
Removed:
    geronimo/trunk/applications/remote-deploy-lib/
Modified:
    geronimo/trunk/applications/pom.xml
    geronimo/trunk/applications/remote-deploy/pom.xml
    geronimo/trunk/applications/remote-deploy/project.xml
    geronimo/trunk/configs/remote-deploy-jetty/project.xml
    geronimo/trunk/configs/remote-deploy-tomcat/project.xml

Modified: geronimo/trunk/applications/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/pom.xml?rev=413963&r1=413962&r2=413963&view=diff
==============================================================================
--- geronimo/trunk/applications/pom.xml (original)
+++ geronimo/trunk/applications/pom.xml Tue Jun 13 12:34:40 2006
@@ -28,7 +28,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.geronimo.applications</groupId>
   <artifactId>applications-parent</artifactId>
-  <version>${geronimoVersion}</version>
+  <version>1.2-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Geronimo Applications</name>
   <description>Geronimo Applications</description>
@@ -43,7 +43,7 @@
           <!-- webXml>${basedir}/target/jspweb.xml</webXml  -->
         </configuration>
       </plugin>
-      <!--
+      <!-- 
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>jspc-maven-plugin</artifactId>
@@ -69,11 +69,11 @@
   <modules>
     <module>demo</module>
     <module>ldap-realm-demo</module>
-    <!-- module>magicGball</module  -->
-    <!-- module>remote-deploy</module  -->
+    <module>magicGball</module>
+    <module>remote-deploy</module>
     <module>uddi-db</module>
     <module>uddi-server</module>
-    <!-- module>console</module  -->
+    <module>console</module>
     <module>welcome</module>
   </modules>
 </project>

Modified: geronimo/trunk/applications/remote-deploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/remote-deploy/pom.xml?rev=413963&r1=413962&r2=413963&view=diff
==============================================================================
--- geronimo/trunk/applications/remote-deploy/pom.xml (original)
+++ geronimo/trunk/applications/remote-deploy/pom.xml Tue Jun 13 12:34:40 2006
@@ -43,30 +43,12 @@
       <scope>provided</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.geronimo.applications</groupId>
-      <artifactId>geronimo-remote-deploy-lib</artifactId>
-      <version>${geronimoVersion}</version>
+     <dependency>
+       <groupId>org.apache.geronimo.modules</groupId>
+       <artifactId>geronimo-kernel</artifactId>
+       <version>${geronimoVersion}</version>
     </dependency>
   </dependencies>
 
-  <!--
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>jspc-maven-plugin</artifactId>
-        <executions>
-          <execution>
-              <id>jspc</id>
-              <goals>
-                  <goal>compile</goal>
-              </goals>
-            </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  -->
 
 </project>

Modified: geronimo/trunk/applications/remote-deploy/project.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/remote-deploy/project.xml?rev=413963&r1=413962&r2=413963&view=diff
==============================================================================
--- geronimo/trunk/applications/remote-deploy/project.xml (original)
+++ geronimo/trunk/applications/remote-deploy/project.xml Tue Jun 13 12:34:40 2006
@@ -39,11 +39,8 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>geronimo-remote-deploy-lib</artifactId>
+            <artifactId>geronimo-kernel</artifactId>
             <version>${pom.currentVersion}</version>
-            <properties>
-                <geronimo.dependency>true</geronimo.dependency>
-            </properties>
         </dependency>
     </dependencies>
 </project>

Modified: geronimo/trunk/configs/remote-deploy-jetty/project.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/remote-deploy-jetty/project.xml?rev=413963&r1=413962&r2=413963&view=diff
==============================================================================
--- geronimo/trunk/configs/remote-deploy-jetty/project.xml (original)
+++ geronimo/trunk/configs/remote-deploy-jetty/project.xml Tue Jun 13 12:34:40 2006
@@ -99,14 +99,6 @@
             <artifactId>geronimo-servlet_2.4_spec</artifactId>
             <version>${geronimo_spec_servlet_version}</version>
         </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-remote-deploy-lib</artifactId>
-            <version>${pom.currentVersion}</version>
-            <properties>
-                <geronimo.dependency>true</geronimo.dependency>
-            </properties>
-        </dependency>
         <!-- parent config -->
         <dependency>
             <groupId>geronimo</groupId>

Modified: geronimo/trunk/configs/remote-deploy-tomcat/project.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/remote-deploy-tomcat/project.xml?rev=413963&r1=413962&r2=413963&view=diff
==============================================================================
--- geronimo/trunk/configs/remote-deploy-tomcat/project.xml (original)
+++ geronimo/trunk/configs/remote-deploy-tomcat/project.xml Tue Jun 13 12:34:40 2006
@@ -98,14 +98,6 @@
             <artifactId>geronimo-servlet_2.4_spec</artifactId>
             <version>${geronimo_spec_servlet_version}</version>
         </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-remote-deploy-lib</artifactId>
-            <version>${pom.currentVersion}</version>
-            <properties>
-                <geronimo.dependency>true</geronimo.dependency>
-            </properties>
-        </dependency>
         <!-- parent config -->
         <dependency>
             <groupId>geronimo</groupId>



Mime
View raw message