geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r886217 [2/2] - in /geronimo/server/trunk: ./ framework/bundles/jstl/ framework/configs/jee-specs/ framework/configs/jee-specs/src/main/history/ framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/ framework/m...
Date Wed, 02 Dec 2009 17:38:05 GMT
Modified: geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml?rev=886217&r1=886216&r2=886217&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml Wed
Dec  2 17:37:59 2009
@@ -7,6 +7,11 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>com.sun.xml.bind</groupId>
+        <artifactId>jaxb-impl</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>commons-beanutils</groupId>
         <artifactId>commons-beanutils</artifactId>
         <type>jar</type>
@@ -22,19 +27,49 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>javax.portlet</groupId>
-        <artifactId>portlet-api</artifactId>
+        <groupId>javax.activation</groupId>
+        <artifactId>activation</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
+        <groupId>javax.xml.bind</groupId>
+        <artifactId>jaxb-api</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>spring</artifactId>
-        <type>car</type>
+        <groupId>javax.xml.bind</groupId>
+        <artifactId>jsr173_api</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.osgi.core</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>asm</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>asm-commons</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>commons-digester</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>jstl</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-crypto</artifactId>
+        <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
@@ -47,38 +82,98 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.pluto</groupId>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-el_1.0_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jsp_2.1_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-servlet_3.0_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.portals</groupId>
+        <artifactId>portlet-api_2.0_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.portals.pluto</groupId>
         <artifactId>pluto-container</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.pluto</groupId>
-        <artifactId>pluto-descriptor-api</artifactId>
+        <groupId>org.apache.portals.pluto</groupId>
+        <artifactId>pluto-container-api</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.pluto</groupId>
-        <artifactId>pluto-descriptor-impl</artifactId>
+        <groupId>org.apache.portals.pluto</groupId>
+        <artifactId>pluto-container-driver-api</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.pluto</groupId>
+        <groupId>org.apache.portals.pluto</groupId>
         <artifactId>pluto-portal-driver</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.pluto</groupId>
+        <groupId>org.apache.portals.pluto</groupId>
         <artifactId>pluto-portal-driver-impl</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.pluto</groupId>
+        <groupId>org.apache.portals.pluto</groupId>
         <artifactId>pluto-taglib</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.codehaus.castor</groupId>
-        <artifactId>castor</artifactId>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.commons-beanutils</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.commons-io</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xstream</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.specs</groupId>
+        <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-reflect</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.ops4j.pax.logging</groupId>
+        <artifactId>pax-logging-api</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>stax</groupId>
+        <artifactId>stax</artifactId>
         <type>jar</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/pluto/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pluto/pom.xml?rev=886217&r1=886216&r2=886217&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pluto/pom.xml (original)
+++ geronimo/server/trunk/plugins/pluto/pom.xml Wed Dec  2 17:37:59 2009
@@ -42,14 +42,21 @@
     </modules>
 
     <properties>
-        <plutoVersion>1.1.6</plutoVersion>
+        <plutoVersion>2.0.1-SNAPSHOT</plutoVersion>
     </properties>
 
   <dependencyManagement>
     <dependencies>
+
+        <dependency>
+            <groupId>org.apache.portals</groupId>
+            <artifactId>portlet-api_2.0_spec</artifactId>
+            <version>1.0</version>
+        </dependency>
+        
       <!-- Admin Console support -->
       <dependency>
-          <groupId>org.apache.pluto</groupId>
+          <groupId>org.apache.portals.pluto</groupId>
           <artifactId>pluto-portal-driver</artifactId>
           <version>${plutoVersion}</version>
           <exclusions>
@@ -101,7 +108,7 @@
       </dependency>
 
       <dependency>
-          <groupId>org.apache.pluto</groupId>
+          <groupId>org.apache.portals.pluto</groupId>
           <artifactId>pluto-portal-driver-impl</artifactId>
           <version>${plutoVersion}</version>
           <exclusions>
@@ -149,8 +156,8 @@
       </dependency>
 
       <dependency>
-          <groupId>org.apache.pluto</groupId>
-          <artifactId>pluto-container</artifactId>
+          <groupId>org.apache.portals.pluto</groupId>
+          <artifactId>pluto-container-api</artifactId>
           <version>${plutoVersion}</version>
           <exclusions>
               <exclusion>
@@ -163,29 +170,28 @@
               </exclusion>
           </exclusions>
       </dependency>
-
       <dependency>
-          <groupId>org.apache.pluto</groupId>
-          <artifactId>pluto-taglib</artifactId>
+          <groupId>org.apache.portals.pluto</groupId>
+          <artifactId>pluto-container-driver-api</artifactId>
           <version>${plutoVersion}</version>
           <exclusions>
               <exclusion>
                   <groupId>commons-logging</groupId>
+                  <artifactId>commons-logging</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>commons-logging</groupId>
                   <artifactId>commons-logging-api</artifactId>
               </exclusion>
           </exclusions>
       </dependency>
 
       <dependency>
-          <groupId>org.apache.pluto</groupId>
-          <artifactId>pluto-descriptor-impl</artifactId>
+          <groupId>org.apache.portals.pluto</groupId>
+          <artifactId>pluto-container</artifactId>
           <version>${plutoVersion}</version>
           <exclusions>
               <exclusion>
-                  <groupId>commons-io</groupId>
-                  <artifactId>commons-io</artifactId>
-              </exclusion>
-              <exclusion>
                   <groupId>commons-logging</groupId>
                   <artifactId>commons-logging</artifactId>
               </exclusion>
@@ -193,27 +199,59 @@
                   <groupId>commons-logging</groupId>
                   <artifactId>commons-logging-api</artifactId>
               </exclusion>
-              <exclusion>
-                  <groupId>xerces</groupId>
-                  <artifactId>xercesImpl</artifactId>
-              </exclusion>
-              <exclusion>
-                  <groupId>xerces</groupId>
-                  <artifactId>xmlParserAPIs</artifactId>
-              </exclusion>
-              <exclusion>
-                  <groupId>xml-apis</groupId>
-                  <artifactId>xml-apis</artifactId>
-              </exclusion>
           </exclusions>
       </dependency>
 
       <dependency>
-          <groupId>org.apache.pluto</groupId>
-          <artifactId>pluto-descriptor-api</artifactId>
+          <groupId>org.apache.portals.pluto</groupId>
+          <artifactId>pluto-taglib</artifactId>
           <version>${plutoVersion}</version>
+          <exclusions>
+              <exclusion>
+                  <groupId>commons-logging</groupId>
+                  <artifactId>commons-logging-api</artifactId>
+              </exclusion>
+          </exclusions>
       </dependency>
 
+      <!--<dependency>-->
+          <!--<groupId>org.apache.portals.pluto</groupId>-->
+          <!--<artifactId>pluto-descriptor-impl</artifactId>-->
+          <!--<version>${plutoVersion}</version>-->
+          <!--<exclusions>-->
+              <!--<exclusion>-->
+                  <!--<groupId>commons-io</groupId>-->
+                  <!--<artifactId>commons-io</artifactId>-->
+              <!--</exclusion>-->
+              <!--<exclusion>-->
+                  <!--<groupId>commons-logging</groupId>-->
+                  <!--<artifactId>commons-logging</artifactId>-->
+              <!--</exclusion>-->
+              <!--<exclusion>-->
+                  <!--<groupId>commons-logging</groupId>-->
+                  <!--<artifactId>commons-logging-api</artifactId>-->
+              <!--</exclusion>-->
+              <!--<exclusion>-->
+                  <!--<groupId>xerces</groupId>-->
+                  <!--<artifactId>xercesImpl</artifactId>-->
+              <!--</exclusion>-->
+              <!--<exclusion>-->
+                  <!--<groupId>xerces</groupId>-->
+                  <!--<artifactId>xmlParserAPIs</artifactId>-->
+              <!--</exclusion>-->
+              <!--<exclusion>-->
+                  <!--<groupId>xml-apis</groupId>-->
+                  <!--<artifactId>xml-apis</artifactId>-->
+              <!--</exclusion>-->
+          <!--</exclusions>-->
+      <!--</dependency>-->
+
+      <!--<dependency>-->
+          <!--<groupId>org.apache.portals.pluto</groupId>-->
+          <!--<artifactId>pluto-descriptor-api</artifactId>-->
+          <!--<version>${plutoVersion}</version>-->
+      <!--</dependency>-->
+
     </dependencies>
   </dependencyManagement>
 </project>

Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml?rev=886217&r1=886216&r2=886217&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml Wed Dec  2 17:37:59
2009
@@ -45,14 +45,14 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
+            <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>jstl</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <!-- for jspc maven plugin -->
         <dependency>
-            <groupId>org.apache.pluto</groupId>
+            <groupId>org.apache.portals.pluto</groupId>
             <artifactId>pluto-taglib</artifactId>
             <scope>provided</scope>
         </dependency>
@@ -100,8 +100,8 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.portlet</groupId>
-            <artifactId>portlet-api</artifactId>
+            <groupId>org.apache.portals</groupId>
+            <artifactId>portlet-api_2.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
 

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/pom.xml?rev=886217&r1=886216&r2=886217&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/pom.xml Wed Dec  2 17:37:59
2009
@@ -55,8 +55,8 @@
         </dependency>
 
         <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.commons-io</artifactId>
             <scope>test</scope>
         </dependency>
 

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java?rev=886217&r1=886216&r2=886217&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Wed Dec  2 17:37:59 2009
@@ -341,7 +341,7 @@
 
     public void addGBeans(EARContext earContext, Module module, Bundle bundle, Collection
repository) throws DeploymentException {
         EARContext moduleContext = module.getEarContext();
-        Bundle webBundle = moduleContext.getBundle();
+        Bundle webBundle = moduleContext.getDeploymentBundle();
         AbstractName moduleName = moduleContext.getModuleName();
         WebModule webModule = (WebModule) module;
 

Modified: geronimo/server/trunk/plugins/welcome/geronimo-welcome/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/welcome/geronimo-welcome/pom.xml?rev=886217&r1=886216&r2=886217&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/welcome/geronimo-welcome/pom.xml (original)
+++ geronimo/server/trunk/plugins/welcome/geronimo-welcome/pom.xml Wed Dec  2 17:37:59 2009
@@ -59,22 +59,22 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo.jspc</groupId>
-                <artifactId>jspc-maven-plugin</artifactId>
-            </plugin>
+    <!--<build>-->
+        <!--<plugins>-->
+            <!--<plugin>-->
+                <!--<groupId>org.codehaus.mojo.jspc</groupId>-->
+                <!--<artifactId>jspc-maven-plugin</artifactId>-->
+            <!--</plugin>-->
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                    <webXml>${project.build.directory}/jspweb.xml</webXml>
-                    <warSourceExcludes>**/*.jsp</warSourceExcludes>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+            <!--<plugin>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-war-plugin</artifactId>-->
+                <!--<configuration>-->
+                    <!--<webXml>${project.build.directory}/jspweb.xml</webXml>-->
+                    <!--<warSourceExcludes>**/*.jsp</warSourceExcludes>-->
+                <!--</configuration>-->
+            <!--</plugin>-->
+        <!--</plugins>-->
+    <!--</build>-->
 
 </project>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=886217&r1=886216&r2=886217&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Wed Dec  2 17:37:59 2009
@@ -125,7 +125,7 @@
         <PlanJMXPort>9999</PlanJMXPort>
         <PlanJMXSecurePort>9998</PlanJMXSecurePort>
 
-         <!-- Plugins source-repository list-->
+        <!-- Plugins source-repository list-->
         <PluginSrcRepoLocal>~/.m2/repository/</PluginSrcRepoLocal>
         <PluginSrcRepoCentral>http://repo1.maven.org/maven2/</PluginSrcRepoCentral>
         <PluginSrcRepoApacheSnapshots>http://repository.apache.org/snapshots/</PluginSrcRepoApacheSnapshots>
@@ -939,9 +939,9 @@
             </dependency>
 
             <dependency>
-                <groupId>commons-io</groupId>
-                <artifactId>commons-io</artifactId>
-                <version>1.2</version>
+                <groupId>org.apache.servicemix.bundles</groupId>
+                <artifactId>org.apache.servicemix.bundles.commons-io</artifactId>
+                <version>1.3.2_1</version>
             </dependency>
 
             <dependency>
@@ -995,7 +995,7 @@
             <dependency>
                 <groupId>org.apache.servicemix.bundles</groupId>
                 <artifactId>org.apache.servicemix.bundles.commons-beanutils</artifactId>
-                <version>1.7.0_4-SNAPSHOT</version>
+                <version>1.7.0_3</version>
                 <exclusions>
                     <exclusion>
                         <groupId>commons-logging</groupId>
@@ -1063,23 +1063,29 @@
                 </exclusions>
             </dependency>
 
-            <dependency>
-                <groupId>portlet-api</groupId>
-                <artifactId>portlet-api</artifactId>
-                <version>1.0</version>
-            </dependency>
-
-            <dependency>
-                <groupId>javax.portlet</groupId>
-                <artifactId>portlet-api</artifactId>
-                <version>1.0</version>
-            </dependency>
+            <!--<dependency>-->
+            <!--<groupId>portlet-api</groupId>-->
+            <!--<artifactId>portlet-api</artifactId>-->
+            <!--<version>1.0</version>-->
+            <!--</dependency>-->
+
+            <!--<dependency>-->
+            <!--<groupId>javax.portlet</groupId>-->
+            <!--<artifactId>portlet-api</artifactId>-->
+            <!--<version>1.0</version>-->
+            <!--</dependency>-->
 
             <!-- Need a non-Sun RI version for Apache Harmony and IBM SDK -->
+            <!--<dependency>-->
+            <!--<groupId>javax.servlet</groupId>-->
+            <!--<artifactId>jstl</artifactId>-->
+            <!--<version>1.2</version>-->
+            <!--</dependency>-->
+
             <dependency>
-                <groupId>javax.servlet</groupId>
+                <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>jstl</artifactId>
-                <version>1.2</version>
+                <version>1.2-SNAPSHOT</version>
             </dependency>
 
             <dependency>
@@ -2119,17 +2125,17 @@
                 </plugin>
 
                 <plugin>
-                  <groupId>org.apache.felix</groupId>
-                  <artifactId>maven-bundle-plugin</artifactId>
-                  <version>2.0.1</version>
-                  <extensions>true</extensions>
-                  <configuration>
-                    <instructions>
-                      <Implementation-Title>${project.name}</Implementation-Title>
-                      <Implementation-Version>${project.version}</Implementation-Version>
-                      <Bundle-DocURL>${project.url}</Bundle-DocURL>
-                    </instructions>
-                  </configuration>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-bundle-plugin</artifactId>
+                    <version>2.0.1</version>
+                    <extensions>true</extensions>
+                    <configuration>
+                        <instructions>
+                            <Implementation-Title>${project.name}</Implementation-Title>
+                            <Implementation-Version>${project.version}</Implementation-Version>
+                            <Bundle-DocURL>${project.url}</Bundle-DocURL>
+                        </instructions>
+                    </configuration>
                 </plugin>
 
                 <!-- INTERNAL -->
@@ -2272,8 +2278,8 @@
         </pluginManagement>
         <plugins>
             <plugin>
-              <groupId>org.apache.felix</groupId>
-              <artifactId>maven-bundle-plugin</artifactId>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
             </plugin>
         </plugins>
 

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml?rev=886217&r1=886216&r2=886217&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml Wed Dec  2 17:37:59
2009
@@ -42,7 +42,7 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.servlet</groupId>
+            <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>jstl</artifactId>
             <scope>provided</scope>
         </dependency>



Mime
View raw message