Author: alexsmirnov Date: 2010-10-05 16:33:34 -0400 (Tue, 05 Oct 2010) New Revision: 19458 Modified: branches/RF-8742/cdk/commons/pom.xml branches/RF-8742/cdk/generator/pom.xml branches/RF-8742/cdk/parent/pom.xml Log: RESOLVED - issue RF-9391: Possible memory leak in CDK https://jira.jboss.org/browse/RF-9391 Modified: branches/RF-8742/cdk/commons/pom.xml =================================================================== --- branches/RF-8742/cdk/commons/pom.xml 2010-10-05 16:03:16 UTC (rev 19457) +++ branches/RF-8742/cdk/commons/pom.xml 2010-10-05 20:33:34 UTC (rev 19458) @@ -1,12 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>parent</artifactId> - <groupId>org.richfaces.cdk</groupId> - <version>4.0.0-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> + <parent> + <artifactId>parent</artifactId> + <groupId>org.richfaces.cdk</groupId> + <version>4.0.0-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> <groupId>org.richfaces.cdk</groupId> <artifactId>commons</artifactId> <version>4.0.0-SNAPSHOT</version> @@ -32,19 +33,19 @@ <artifactId>junit</artifactId> </dependency> <dependency> - <groupId>com.google.inject</groupId> - <artifactId>guice</artifactId> + <groupId>org.sonatype.sisu</groupId> + <artifactId>sisu-guice</artifactId> </dependency> <dependency> <groupId>org.easymock</groupId> <artifactId>easymock</artifactId> </dependency> <dependency> - <groupId>com.google.code.javaparser</groupId> - <artifactId>javaparser</artifactId> - <version>1.0.1</version> - <scope>test</scope> - </dependency> - + <groupId>com.google.code.javaparser</groupId> + <artifactId>javaparser</artifactId> + <version>1.0.1</version> + <scope>test</scope> + </dependency> + </dependencies> </project> Modified: branches/RF-8742/cdk/generator/pom.xml =================================================================== --- branches/RF-8742/cdk/generator/pom.xml 2010-10-05 16:03:16 UTC (rev 19457) +++ branches/RF-8742/cdk/generator/pom.xml 2010-10-05 20:33:34 UTC (rev 19458) @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>parent</artifactId> - <groupId>org.richfaces.cdk</groupId> - <version>4.0.0-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>parent</artifactId> + <groupId>org.richfaces.cdk</groupId> + <version>4.0.0-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk</groupId> <artifactId>generator</artifactId> @@ -18,9 +19,9 @@ <plugin> <groupId>org.apache.camel</groupId> <artifactId>guice-maven-plugin</artifactId> - <!--<configuration>--> - <!--<mainClass>mypackage.boot.camel.CamelStartup</mainClass>--> - <!--</configuration>--> + <!--<configuration> --> + <!--<mainClass>mypackage.boot.camel.CamelStartup</mainClass> --> + <!--</configuration> --> </plugin> <plugin> <groupId>org.codehaus.groovy.maven</groupId> @@ -56,12 +57,10 @@ <useSystemClassLoader>true</useSystemClassLoader> </configuration> </plugin> - <!-- - plugin> <groupId>org.codehaus.mojo</groupId> - <artifactId>jaxb2-maven-plugin</artifactId> <executions> <execution> - <goals> <goal>xjc</goal> </goals> </execution> </executions> - <configuration> <packageName>org.richfaces.cdk.model</packageName> - </configuration> </plugin --> + <!-- plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>jaxb2-maven-plugin</artifactId> + <executions> <execution> <goals> <goal>xjc</goal> </goals> </execution> </executions> + <configuration> <packageName>org.richfaces.cdk.model</packageName> </configuration> + </plugin --> </plugins> <resources> <resource> @@ -77,10 +76,8 @@ </resources> </build> <dependencies> - <!-- - <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-guice</artifactId> </dependency> - --> + <!-- <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-guice</artifactId> + </dependency> --> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -124,17 +121,16 @@ <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> </dependency> - <dependency> - <!-- This must not be inherited from parent/bom it must be set to - not be "provided" even though it is provided by container - this is building a maven plugin that runs outside of container - TODO A better place for this may be needed, cdk-parent/cdk-bom? - --> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>2.0.2</version> - </dependency> <dependency> + <!-- This must not be inherited from parent/bom it must be set to not + be "provided" even though it is provided by container this is building a + maven plugin that runs outside of container TODO A better place for this + may be needed, cdk-parent/cdk-bom? --> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>2.0.2</version> + </dependency> + <dependency> <groupId>javax.servlet.jsp</groupId> <artifactId>jsp-api</artifactId> </dependency> @@ -150,20 +146,17 @@ <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> </dependency> - <!-- - <dependency> - <groupId>org.w3c.css</groupId> <artifactId>sac</artifactId> - <version>1.3</version> </dependency> - --> + <!-- <dependency> <groupId>org.w3c.css</groupId> <artifactId>sac</artifactId> + <version>1.3</version> </dependency> --> <dependency> <groupId>org.easymock</groupId> <artifactId>easymock</artifactId> </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> <groupId>com.sun.xsom</groupId> <artifactId>xsom</artifactId> </dependency> @@ -176,36 +169,19 @@ <artifactId>javaparser</artifactId> <scope>test</scope> </dependency> - <!-- - <dependency> <groupId>com.google.code.guice</groupId> - <artifactId>guice</artifactId> <version>1.0</version> </dependency> - --> + <!-- <dependency> <groupId>com.google.code.guice</groupId> <artifactId>guice</artifactId> + <version>1.0</version> </dependency> --> - <!-- - <dependency> <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> <version>1</version> - </dependency> - --> + <!-- <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> + <version>1</version> </dependency> --> <dependency> - <groupId>com.google.inject</groupId> - <artifactId>guice</artifactId> + <groupId>org.sonatype.sisu</groupId> + <artifactId>sisu-guice</artifactId> </dependency> + <dependency> <groupId>com.google.inject.extensions</groupId> <artifactId>guice-multibindings</artifactId> </dependency> - <!-- - <dependency> <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-grapher</artifactId> </dependency> - --> - <!-- - <dependency> <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-assisted-inject</artifactId> </dependency> - --><!-- - <dependency> - <groupId>org.beanshell</groupId> - <artifactId>bsh</artifactId> - <version>2.0b4</version> - </dependency> - --></dependencies> + </dependencies> </project> \ No newline at end of file Modified: branches/RF-8742/cdk/parent/pom.xml =================================================================== --- branches/RF-8742/cdk/parent/pom.xml 2010-10-05 16:03:16 UTC (rev 19457) +++ branches/RF-8742/cdk/parent/pom.xml 2010-10-05 20:33:34 UTC (rev 19458) @@ -1,12 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>org.richfaces</groupId> <artifactId>richfaces-root-parent</artifactId> <version>4.0.0-SNAPSHOT</version> - <relativePath>../../parent/pom.xml</relativePath> + <relativePath>../../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -91,9 +92,9 @@ <groupId>org.apache.camel</groupId> <artifactId>guice-maven-plugin</artifactId> <version>2.2.0</version> - <!--<configuration>--> - <!--<mainClass>mypackage.boot.camel.CamelStartup</mainClass>--> - <!--</configuration>--> + <!--<configuration> --> + <!--<mainClass>mypackage.boot.camel.CamelStartup</mainClass> --> + <!--</configuration> --> <dependencies> <dependency> <groupId>org.apache.camel</groupId> @@ -147,10 +148,17 @@ </exclusions> </dependency> <dependency> + <groupId>org.sonatype.sisu</groupId> + <artifactId>sisu-guice</artifactId> + <version>2.1.7</version> + </dependency> + <!-- + <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> <version>2.0</version> </dependency> + --> <dependency> <groupId>com.google.inject.extensions</groupId> <artifactId>guice-multibindings</artifactId> @@ -208,30 +216,30 @@ </exclusion> </exclusions> </dependency> - - <!-- Resources plugin dependencies --> - <dependency> - <groupId>org.reflections</groupId> - <artifactId>reflections</artifactId> - <version>0.9.5-RC2_jboss-SP1</version> - <exclusions> - <exclusion> - <groupId>com.google.collections</groupId> - <artifactId>google-collections</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>com.sun.el</groupId> - <artifactId>el-ri</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>com.yahoo.platform.yui</groupId> - <artifactId>yuicompressor</artifactId> - <version>2.3.6</version> - </dependency> + <!-- Resources plugin dependencies --> + <dependency> + <groupId>org.reflections</groupId> + <artifactId>reflections</artifactId> + <version>0.9.5-RC2_jboss-SP1</version> + <exclusions> + <exclusion> + <groupId>com.google.collections</groupId> + <artifactId>google-collections</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.sun.el</groupId> + <artifactId>el-ri</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>com.yahoo.platform.yui</groupId> + <artifactId>yuicompressor</artifactId> + <version>2.3.6</version> + </dependency> + <!-- Tests --> <dependency> <groupId>junit</groupId>