You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ri...@apache.org on 2009/12/03 15:56:47 UTC
svn commit: r886799 - in /geronimo/server/trunk/plugins: ./
activemq/activemq-portlets/ connector-1_6/geronimo-connector-server/
openejb/openejb-portlets/ pluto/pluto-support/
pluto/pluto-support/src/main/history/ tomcat/tomcat6/src/main/history/
Author: rickmcguire
Date: Thu Dec 3 14:56:46 2009
New Revision: 886799
URL: http://svn.apache.org/viewvc?rev=886799&view=rev
Log:
get plugins to build cleanly after pluto changes
Modified:
geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-server/pom.xml
geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml
geronimo/server/trunk/plugins/pluto/pluto-support/pom.xml
geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/pom.xml
geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/history/dependencies.xml
Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml?rev=886799&r1=886798&r2=886799&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml Thu Dec 3 14:56:46 2009
@@ -54,9 +54,10 @@
<!-- for jspc maven plugin -->
<dependency>
- <groupId>org.apache.portals.pluto</groupId>
- <artifactId>pluto-taglib</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>pluto-support</artifactId>
+ <version>${version}</version>
+ <type>car</type>
</dependency>
<dependency>
@@ -95,12 +96,6 @@
</dependency>
<dependency>
- <groupId>org.apache.portals</groupId>
- <artifactId>portlet-api_2.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-deploy-jsr88</artifactId>
<version>${version}</version>
Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-server/pom.xml?rev=886799&r1=886798&r2=886799&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-server/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-server/pom.xml Thu Dec 3 14:56:46 2009
@@ -11,6 +11,8 @@
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>geronimo-connector-server</artifactId>
<packaging>server-assembly</packaging>
+ <name>Geronimo Plugins, Connector 1.6 :: Server</name>
+
<build>
<pluginManagement>
<plugins>
@@ -197,5 +199,5 @@
</build>
</profile>
</profiles>
-
+
</project>
Modified: geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml?rev=886799&r1=886798&r2=886799&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml Thu Dec 3 14:56:46 2009
@@ -6,9 +6,9 @@
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -56,12 +56,13 @@
<type>car</type>
<scope>provided</scope>
</dependency>
-
+
<!-- for jspc maven plugin -->
<dependency>
- <groupId>org.apache.portals.pluto</groupId>
- <artifactId>pluto-taglib</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>pluto-support</artifactId>
+ <version>${version}</version>
+ <type>car</type>
</dependency>
<dependency>
@@ -121,17 +122,11 @@
</dependency>
<dependency>
- <groupId>org.apache.portals</groupId>
- <artifactId>portlet-api_2.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
@@ -184,7 +179,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>native2ascii-maven-plugin</artifactId>
- </plugin>
+ </plugin>
</plugins>
</build>
Modified: geronimo/server/trunk/plugins/pluto/pluto-support/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pluto/pluto-support/pom.xml?rev=886799&r1=886798&r2=886799&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pluto/pluto-support/pom.xml (original)
+++ geronimo/server/trunk/plugins/pluto/pluto-support/pom.xml Thu Dec 3 14:56:46 2009
@@ -49,18 +49,19 @@
<dependency>
<groupId>org.apache.portals</groupId>
<artifactId>portlet-api_2.0_spec</artifactId>
+ <version>1.0</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_3.0_spec</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jsp_2.1_spec</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-el_1.0_spec</artifactId>
@@ -70,12 +71,12 @@
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto-container</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto-container-api</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto-container-driver-api</artifactId>
@@ -110,7 +111,7 @@
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.commons-beanutils</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.commons-io</artifactId>
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=886799&r1=886798&r2=886799&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 Thu Dec 3 14:56:46 2009
@@ -37,8 +37,8 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jsr173_api</artifactId>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>stax-api</artifactId>
<type>jar</type>
</dependency>
<dependency>
Modified: geronimo/server/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pom.xml?rev=886799&r1=886798&r2=886799&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pom.xml (original)
+++ geronimo/server/trunk/plugins/pom.xml Thu Dec 3 14:56:46 2009
@@ -97,7 +97,7 @@
<modules>
<!-- MNG-4052 modules used as import-scope need to be before anything that uses them -->
- <!--<module>pluto</module>-->
+ <module>pluto</module>
<module>system-database</module>
<module>activemq</module>
<module>aspectj</module>
Modified: geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/history/dependencies.xml?rev=886799&r1=886798&r2=886799&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/history/dependencies.xml Thu Dec 3 14:56:46 2009
@@ -42,6 +42,11 @@
<type>jar</type>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.ext.tomcat</groupId>
+ <artifactId>util</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>server-security-config</artifactId>
<type>car</type>