Author: djencks
Date: Sat Aug 1 20:43:06 2009
New Revision: 799922
URL: http://svn.apache.org/viewvc?rev=799922&view=rev
Log:
GERONIMO-4780 make jsr88 client avoid loading gbeans with encrypted attributes
Modified:
geronimo/server/trunk/plugins/connector/geronimo-connector-builder/pom.xml
geronimo/server/trunk/plugins/cxf/cxf-jaxws-tools/pom.xml
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml
geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/pom.xml
geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/pom.xml
geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/pom.xml
Modified: geronimo/server/trunk/plugins/connector/geronimo-connector-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/geronimo-connector-builder/pom.xml?rev=799922&r1=799921&r2=799922&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/geronimo-connector-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector/geronimo-connector-builder/pom.xml Sat Aug 1
20:43:06 2009
@@ -39,11 +39,11 @@
<version>${version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-deploy-config</artifactId>
- <version>${version}</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.framework</groupId>-->
+ <!--<artifactId>geronimo-deploy-config</artifactId>-->
+ <!--<version>${version}</version>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>jee-specs</artifactId>
Modified: geronimo/server/trunk/plugins/cxf/cxf-jaxws-tools/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-jaxws-tools/pom.xml?rev=799922&r1=799921&r2=799922&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf-jaxws-tools/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf-jaxws-tools/pom.xml Sat Aug 1 20:43:06 2009
@@ -57,6 +57,11 @@
<artifactId>geronimo-cxf-tools</artifactId>
<version>${version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-crypto</artifactId>
+ <version>${version}</version>
+ </dependency>
</dependencies>
<build>
@@ -85,6 +90,11 @@
</element>
<element>
<groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-crypto</artifactId>
+ <version>${version}</version>
+ </element>
+ <element>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-system</artifactId>
<version>${version}</version>
</element>
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml?rev=799922&r1=799921&r2=799922&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml Sat Aug 1 20:43:06 2009
@@ -49,10 +49,16 @@
<artifactId>geronimo-j2ee</artifactId>
<version>${version}</version>
</dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.framework</groupId>-->
+ <!--<artifactId>geronimo-deploy-config</artifactId>-->
+ <!--<version>${version}</version>-->
+ <!--</dependency>-->
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-deploy-config</artifactId>
+ <groupId>org.apache.geronimo.plugins.classloaders</groupId>
+ <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
<version>${version}</version>
+ <type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
Modified: geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml?rev=799922&r1=799921&r2=799922&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml Sat
Aug 1 20:43:06 2009
@@ -48,6 +48,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.plugins.classloaders</groupId>
+ <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.plugins.classloaders</groupId>
<artifactId>geronimo-schema-jee_5</artifactId>
<type>car</type>
</dependency>
Modified: geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/pom.xml?rev=799922&r1=799921&r2=799922&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/pom.xml Sat Aug 1 20:43:06 2009
@@ -34,12 +34,12 @@
<packaging>car</packaging>
<dependencies>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>jsr88-cli</artifactId>
- <version>${version}</version>
- <type>car</type>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.framework</groupId>-->
+ <!--<artifactId>jsr88-cli</artifactId>-->
+ <!--<version>${version}</version>-->
+ <!--<type>car</type>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
@@ -56,12 +56,12 @@
<configuration>
<warnOnDependencyChange>true</warnOnDependencyChange>
<dependencies>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>jsr88-cli</artifactId>
- <type>car</type>
- <import>classes</import>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.framework</groupId>-->
+ <!--<artifactId>jsr88-cli</artifactId>-->
+ <!--<type>car</type>-->
+ <!--<import>classes</import>-->
+ <!--</dependency>-->
</dependencies>
<category>Deployment</category>
<instance>
Modified: geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/pom.xml?rev=799922&r1=799921&r2=799922&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/pom.xml Sat Aug 1 20:43:06 2009
@@ -41,11 +41,16 @@
<!--<type>car</type>-->
<!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.configs</groupId>-->
+ <!--<artifactId>connector-deployer</artifactId>-->
+ <!--<version>${version}</version>-->
+ <!--<type>car</type>-->
+ <!--</dependency>-->
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>connector-deployer</artifactId>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-connector-builder</artifactId>
<version>${version}</version>
- <type>car</type>
</dependency>
</dependencies>
@@ -58,12 +63,12 @@
<warnOnDependencyChange>true</warnOnDependencyChange>
<dependencies>
<!-- should this be the connector-deployer jar??? -->
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>connector-deployer</artifactId>
- <type>car</type>
- <import>classes</import>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.configs</groupId>-->
+ <!--<artifactId>connector-deployer</artifactId>-->
+ <!--<type>car</type>-->
+ <!--<import>classes</import>-->
+ <!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.apache.geronimo.framework</groupId>-->
<!--<artifactId>jsr88-cli</artifactId>-->
Modified: geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/pom.xml?rev=799922&r1=799921&r2=799922&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/pom.xml Sat Aug 1 20:43:06 2009
@@ -34,12 +34,12 @@
<packaging>car</packaging>
<dependencies>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>jsr88-cli</artifactId>
- <version>${version}</version>
- <type>car</type>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.framework</groupId>-->
+ <!--<artifactId>jsr88-cli</artifactId>-->
+ <!--<version>${version}</version>-->
+ <!--<type>car</type>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
@@ -56,12 +56,12 @@
<configuration>
<warnOnDependencyChange>true</warnOnDependencyChange>
<dependencies>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>jsr88-cli</artifactId>
- <type>car</type>
- <import>classes</import>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.framework</groupId>-->
+ <!--<artifactId>jsr88-cli</artifactId>-->
+ <!--<type>car</type>-->
+ <!--<import>classes</import>-->
+ <!--</dependency>-->
</dependencies>
<category>Deployment</category>
<instance>
|