You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2009/12/03 09:18:13 UTC
svn commit: r886703 - in /geronimo/server/trunk: ./ framework/bundles/
framework/bundles/dwr/ framework/configs/gshell-remote/src/main/history/
framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/
plugins/console/console-...
Author: djencks
Date: Thu Dec 3 08:18:11 2009
New Revision: 886703
URL: http://svn.apache.org/viewvc?rev=886703&view=rev
Log:
use bundleized dwr. Start trying to not use spring in pluto. Mysterious linkage error building console-tomcat
Added:
geronimo/server/trunk/framework/bundles/dwr/
- copied from r886211, geronimo/server/trunk/framework/bundles/jstl/
geronimo/server/trunk/framework/bundles/dwr/pom.xml
- copied, changed from r886217, geronimo/server/trunk/framework/bundles/jstl/pom.xml
Modified:
geronimo/server/trunk/framework/bundles/pom.xml
geronimo/server/trunk/framework/configs/gshell-remote/src/main/history/dependencies.xml
geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java
geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml
geronimo/server/trunk/plugins/console/console-core/pom.xml
geronimo/server/trunk/plugins/console/console-jetty/pom.xml
geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/web.xml
geronimo/server/trunk/plugins/console/console-tomcat/pom.xml
geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml
geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml
geronimo/server/trunk/plugins/monitoring/mconsole-war/pom.xml
geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml
geronimo/server/trunk/plugins/plancreator/plancreator-portlets/pom.xml
geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml
geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml
geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml
geronimo/server/trunk/pom.xml
Copied: geronimo/server/trunk/framework/bundles/dwr/pom.xml (from r886217, geronimo/server/trunk/framework/bundles/jstl/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/dwr/pom.xml?p2=geronimo/server/trunk/framework/bundles/dwr/pom.xml&p1=geronimo/server/trunk/framework/bundles/jstl/pom.xml&r1=886217&r2=886703&rev=886703&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/jstl/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/dwr/pom.xml Thu Dec 3 08:18:11 2009
@@ -29,18 +29,29 @@
</parent>
<groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>jstl</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <artifactId>dwr</artifactId>
+ <version>3.0.M1_1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
<description>
This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
</description>
+ <!--<dependency>-->
+ <!--<groupId>org.directwebremoting</groupId>-->
+ <!--<artifactId>dwr</artifactId>-->
+ <!--<version>3.0.M1</version>-->
+ <!--<exclusions>-->
+ <!--<exclusion>-->
+ <!--<groupId>org.mortbay.jetty</groupId>-->
+ <!--<artifactId>cometd</artifactId>-->
+ <!--</exclusion>-->
+ <!--</exclusions>-->
+ <!--</dependency>-->
<properties>
- <pkgGroupId>javax.servlet</pkgGroupId>
- <pkgArtifactId>jstl</pkgArtifactId>
- <pkgVersion>1.2</pkgVersion>
+ <pkgGroupId>org.directwebremoting</pkgGroupId>
+ <pkgArtifactId>dwr</pkgArtifactId>
+ <pkgVersion>3.0.M1</pkgVersion>
</properties>
<dependencies>
<dependency>
@@ -59,8 +70,22 @@
<!--<version>2.0.1-SNAPSHOT</version>-->
<configuration>
<instructions>
- <Export-Package>javax.servlet.jsp.jstl*;version="1.2",*</Export-Package>
- <Import-Package>com.sun.org.apache*;resolution:=optional,*</Import-Package>
+ <Export-Package>org.directwebremoting*;version="3.0.M1",
+ jsx3*,
+ uk.ltd.getahead*</Export-Package>
+ <Import-Package>com.google*;resolution:=optional,
+ com.opensymphony*;resolution:=optional,
+ dojox.cometd*;resolution:=optional,
+ javax.faces*;resolution:=optional,
+ net.sf.hibernate*;resolution:=optional,
+ org.hibernate*;resolution:=optional,
+ nu.xom*;resolution:=optional,
+ org.apache.bsf*;resolution:=optional,
+ org.apache.struts*;resolution:=optional,
+ org.springframework*;resolution:=optional,
+ org.jdom*;resolution:=optional,
+ org.dom4j*;resolution:=optional,
+ *</Import-Package>
<!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
<Embed-Dependency>*;scope=provided;inline=true</Embed-Dependency>
</instructions>
Modified: geronimo/server/trunk/framework/bundles/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/pom.xml?rev=886703&r1=886702&r2=886703&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/pom.xml Thu Dec 3 08:18:11 2009
@@ -43,6 +43,7 @@
<module>commons-digester</module>
<module>commons-discovery</module>
<module>derby-all</module>
+ <module>dwr</module>
<module>jstl</module>
<!-- todo remove -->
<module>log4j</module>
Modified: geronimo/server/trunk/framework/configs/gshell-remote/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/gshell-remote/src/main/history/dependencies.xml?rev=886703&r1=886702&r2=886703&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/gshell-remote/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/gshell-remote/src/main/history/dependencies.xml Thu Dec 3 08:18:11 2009
@@ -46,4 +46,9 @@
<artifactId>mina-filter-ssl</artifactId>
<type>jar</type>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <type>jar</type>
+ </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java?rev=886703&r1=886702&r2=886703&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java Thu Dec 3 08:18:11 2009
@@ -745,7 +745,7 @@
return configuration.getBundle();
}
- public BundleContext getBundleContext() {
+ protected BundleContext getBundleContext() {
return bundleContext;
}
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml?rev=886703&r1=886702&r2=886703&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml Thu Dec 3 08:18:11 2009
@@ -86,9 +86,8 @@
</dependency>
<dependency>
- <groupId>org.directwebremoting</groupId>
+ <groupId>org.apache.geronimo.bundles</groupId>
<artifactId>dwr</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
Modified: geronimo/server/trunk/plugins/console/console-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-core/pom.xml?rev=886703&r1=886702&r2=886703&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-core/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-core/pom.xml Thu Dec 3 08:18:11 2009
@@ -72,7 +72,7 @@
</dependency>
<dependency>
- <groupId>org.directwebremoting</groupId>
+ <groupId>org.apache.geronimo.bundles</groupId>
<artifactId>dwr</artifactId>
</dependency>
Modified: geronimo/server/trunk/plugins/console/console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-jetty/pom.xml?rev=886703&r1=886702&r2=886703&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-jetty/pom.xml Thu Dec 3 08:18:11 2009
@@ -75,7 +75,7 @@
</dependency>
<dependency>
- <groupId>org.directwebremoting</groupId>
+ <groupId>org.apache.geronimo.bundles</groupId>
<artifactId>dwr</artifactId>
</dependency>
Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/web.xml?rev=886703&r1=886702&r2=886703&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/web.xml Thu Dec 3 08:18:11 2009
@@ -44,9 +44,9 @@
<listener-class>org.apache.geronimo.console.filter.XSSXSRFFilter</listener-class>
</listener>
- <listener>
- <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
- </listener>
+ <!--<listener>-->
+ <!--<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>-->
+ <!--</listener>-->
<listener>
<listener-class>org.apache.pluto.driver.PortalStartupListener</listener-class>
Modified: geronimo/server/trunk/plugins/console/console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-tomcat/pom.xml?rev=886703&r1=886702&r2=886703&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-tomcat/pom.xml Thu Dec 3 08:18:11 2009
@@ -75,7 +75,7 @@
</dependency>
<dependency>
- <groupId>org.directwebremoting</groupId>
+ <groupId>org.apache.geronimo.bundles</groupId>
<artifactId>dwr</artifactId>
</dependency>
Modified: geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml?rev=886703&r1=886702&r2=886703&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml Thu Dec 3 08:18:11 2009
@@ -12,8 +12,8 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>dwr</artifactId>
<type>jar</type>
</dependency>
<dependency>
@@ -66,9 +66,4 @@
<artifactId>geronimo-jms_1.1_spec</artifactId>
<type>jar</type>
</dependency>
- <dependency>
- <groupId>org.directwebremoting</groupId>
- <artifactId>dwr</artifactId>
- <type>jar</type>
- </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml?rev=886703&r1=886702&r2=886703&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml Thu Dec 3 08:18:11 2009
@@ -102,7 +102,7 @@
</dependency>
<dependency>
- <groupId>org.directwebremoting</groupId>
+ <groupId>org.apache.geronimo.bundles</groupId>
<artifactId>dwr</artifactId>
<scope>provided</scope>
</dependency>
Modified: geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml?rev=886703&r1=886702&r2=886703&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml Thu Dec 3 08:18:11 2009
@@ -84,7 +84,7 @@
</dependency>
<dependency>
- <groupId>org.directwebremoting</groupId>
+ <groupId>org.apache.geronimo.bundles</groupId>
<artifactId>dwr</artifactId>
<scope>provided</scope>
</dependency>
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/pom.xml?rev=886703&r1=886702&r2=886703&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/pom.xml Thu Dec 3 08:18:11 2009
@@ -50,7 +50,7 @@
</dependency>
<dependency>
- <groupId>org.directwebremoting</groupId>
+ <groupId>org.apache.geronimo.bundles</groupId>
<artifactId>dwr</artifactId>
<scope>provided</scope>
</dependency>
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=886703&r1=886702&r2=886703&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml Thu Dec 3 08:18:11 2009
@@ -139,7 +139,7 @@
</dependency>
<dependency>
- <groupId>org.directwebremoting</groupId>
+ <groupId>org.apache.geronimo.bundles</groupId>
<artifactId>dwr</artifactId>
<scope>provided</scope>
</dependency>
Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/pom.xml?rev=886703&r1=886702&r2=886703&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/pom.xml Thu Dec 3 08:18:11 2009
@@ -139,7 +139,7 @@
</dependency>
<dependency>
- <groupId>org.directwebremoting</groupId>
+ <groupId>org.apache.geronimo.bundles</groupId>
<artifactId>dwr</artifactId>
<scope>provided</scope>
</dependency>
Modified: geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml?rev=886703&r1=886702&r2=886703&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml Thu Dec 3 08:18:11 2009
@@ -234,12 +234,7 @@
</dependency>
<dependency>
- <groupId>org.directwebremoting</groupId>
- <artifactId>dwr</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.directwebremoting</groupId>
+ <groupId>org.apache.geronimo.bundles</groupId>
<artifactId>dwr</artifactId>
</dependency>
Modified: geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml?rev=886703&r1=886702&r2=886703&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml Thu Dec 3 08:18:11 2009
@@ -233,7 +233,7 @@
</dependency>
<dependency>
- <groupId>org.directwebremoting</groupId>
+ <groupId>org.apache.geronimo.bundles</groupId>
<artifactId>dwr</artifactId>
</dependency>
</dependencies>
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=886703&r1=886702&r2=886703&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml Thu Dec 3 08:18:11 2009
@@ -113,7 +113,7 @@
</dependency>
<dependency>
- <groupId>org.directwebremoting</groupId>
+ <groupId>org.apache.geronimo.bundles</groupId>
<artifactId>dwr</artifactId>
<scope>provided</scope>
</dependency>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=886703&r1=886702&r2=886703&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Thu Dec 3 08:18:11 2009
@@ -1014,9 +1014,10 @@
</dependency>
<dependency>
+ <!-- already bundleized -->
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.1.1</version>
+ <version>1.2.1</version>
</dependency>
<dependency>
@@ -1088,16 +1089,22 @@
<version>1.2-SNAPSHOT</version>
</dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.directwebremoting</groupId>-->
+ <!--<artifactId>dwr</artifactId>-->
+ <!--<version>3.0.M1</version>-->
+ <!--<exclusions>-->
+ <!--<exclusion>-->
+ <!--<groupId>org.mortbay.jetty</groupId>-->
+ <!--<artifactId>cometd</artifactId>-->
+ <!--</exclusion>-->
+ <!--</exclusions>-->
+ <!--</dependency>-->
+
<dependency>
- <groupId>org.directwebremoting</groupId>
+ <groupId>org.apache.geronimo.bundles</groupId>
<artifactId>dwr</artifactId>
- <version>3.0.M1</version>
- <exclusions>
- <exclusion>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>cometd</artifactId>
- </exclusion>
- </exclusions>
+ <version>3.0.M1_1-SNAPSHOT</version>
</dependency>
<dependency>