Author: norman
Date: Fri Oct 16 15:41:00 2009
New Revision: 825954
URL: http://svn.apache.org/viewvc?rev=825954&view=rev
Log:
start to add guice and guicey-fruity to the mix to work on replacing avalon at
all
Added:
james/server/trunk/stage/com.google.code.guice/
james/server/trunk/stage/com.google.code.guice/jars/
james/server/trunk/stage/com.google.code.guice/jars/guice-2.0.jar (with
props)
james/server/trunk/stage/com.google.code.guice/poms/
james/server/trunk/stage/com.google.code.guice/poms/guice-2.0.pom
james/server/trunk/stage/org.guiceyfruit/
james/server/trunk/stage/org.guiceyfruit/jars/
james/server/trunk/stage/org.guiceyfruit/jars/guice-core-2.0-beta-4.jar
(with props)
james/server/trunk/stage/org.guiceyfruit/jars/guice-jsr250-2.0-beta-4.jar
(with props)
james/server/trunk/stage/org.guiceyfruit/poms/
james/server/trunk/stage/org.guiceyfruit/poms/guice-core-2.0-beta-4.pom
james/server/trunk/stage/org.guiceyfruit/poms/guice-jsr250-2.0-beta-4.pom
Modified:
james/server/trunk/pom.xml
james/server/trunk/stage/pom.xml
Modified: james/server/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=825954&r1=825953&r2=825954&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Fri Oct 16 15:41:00 2009
@@ -1107,6 +1107,22 @@
<version>1.4.6</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.guiceyfruit</groupId>
+ <artifactId>guice-jsr250</artifactId>
+ <version>2.0-beta-4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.guiceyfruit</groupId>
+ <artifactId>guice-core</artifactId>
+ <version>2.0-beta-4</version>
+ </dependency>
</dependencies>
</dependencyManagement>
Added: james/server/trunk/stage/com.google.code.guice/jars/guice-2.0.jar
URL:
http://svn.apache.org/viewvc/james/server/trunk/stage/com.google.code.guice/jars/guice-2.0.jar?rev=825954&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/stage/com.google.code.guice/jars/guice-2.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/server/trunk/stage/com.google.code.guice/poms/guice-2.0.pom
URL:
http://svn.apache.org/viewvc/james/server/trunk/stage/com.google.code.guice/poms/guice-2.0.pom?rev=825954&view=auto
==============================================================================
--- james/server/trunk/stage/com.google.code.guice/poms/guice-2.0.pom (added)
+++ james/server/trunk/stage/com.google.code.guice/poms/guice-2.0.pom Fri Oct
16 15:41:00 2009
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice</artifactId>
+ <version>2.0</version>
+</project>
\ No newline at end of file
Added: james/server/trunk/stage/org.guiceyfruit/jars/guice-core-2.0-beta-4.jar
URL:
http://svn.apache.org/viewvc/james/server/trunk/stage/org.guiceyfruit/jars/guice-core-2.0-beta-4.jar?rev=825954&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
james/server/trunk/stage/org.guiceyfruit/jars/guice-core-2.0-beta-4.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/server/trunk/stage/org.guiceyfruit/jars/guice-jsr250-2.0-beta-4.jar
URL:
http://svn.apache.org/viewvc/james/server/trunk/stage/org.guiceyfruit/jars/guice-jsr250-2.0-beta-4.jar?rev=825954&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
james/server/trunk/stage/org.guiceyfruit/jars/guice-jsr250-2.0-beta-4.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/server/trunk/stage/org.guiceyfruit/poms/guice-core-2.0-beta-4.pom
URL:
http://svn.apache.org/viewvc/james/server/trunk/stage/org.guiceyfruit/poms/guice-core-2.0-beta-4.pom?rev=825954&view=auto
==============================================================================
--- james/server/trunk/stage/org.guiceyfruit/poms/guice-core-2.0-beta-4.pom
(added)
+++ james/server/trunk/stage/org.guiceyfruit/poms/guice-core-2.0-beta-4.pom Fri
Oct 16 15:41:00 2009
@@ -0,0 +1,142 @@
+<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";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.guiceyfruit</groupId>
+ <artifactId>guice</artifactId>
+ <version>2.0-beta-4</version>
+ </parent>
+ <artifactId>guice-core</artifactId>
+ <version>2.0-beta-4</version>
+ <packaging>jar</packaging>
+ <name>guice-core</name>
+ <dependencies>
+ <dependency>
+ <groupId>com.google.code.google-collections</groupId>
+ <artifactId>google-collect</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ </dependency>
+
+ <!-- test dependencies -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- ... spring is here ONLY for PerformanceComparison test: -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/*$*Test.*</exclude>
+ <!-- TODO FIXME ASAP -->
+ <exclude>**/BytecodeGenTest.*</exclude>
+ <exclude>**/BinderTest.*</exclude>
+ <exclude>**/ScopesTest.*</exclude>
+ <exclude>**/ParentInjectorTest.*</exclude>
+ <exclude>**/OverrideModuleTest.*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+
+ <!-- generate the attached tests jar -->
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <excludes>
+<!-- <exclude>com/google/inject/*/**.class</exclude>
+ <exclude>com/googlecode/**/*</exclude>
+--> </excludes>
+ </configuration>
+ </plugin>
+
+ <!--
+ At this time, there is no proper JarJar Links plugin for Maven, so the
+ only option is to use maven-antrun-plugin with JarJar. JarJar can only
+ output as .jar files, thus a temporary .jar file is created and then
+ unzip it over the previous target/classes directory.
+ -->
+ <!--
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <property name="libs" value="../../guice-external/lib/build/"
/>
+ <taskdef name="jarjar"
classname="com.tonicsystems.jarjar.JarJarTask"
classpath="${libs}/jarjar-1.0rc7.jar" />
+ <jarjar
jarfile="${project.build.directory}/${project.build.finalName}-jarjar.jar">
+ <fileset dir="${project.build.outputDirectory}" />
+ <zipfileset src="${libs}/cglib-2.2.jar" />
+ <zipfileset src="${libs}/asm-3.1.jar" />
+ <zipfileset
src="${libs}/google-collect-snapshot-20080530.jar" />
+ <rule pattern="com.google.common.**"
result="org.guiceyfruit.intern...@1" />
+ <rule pattern="net.sf.cglib.**"
result="org.guiceyfruit.internal.cgl...@1" />
+ <rule pattern="org.objectweb.asm.**"
result="org.guiceyfruit.internal.a...@1" />
+ <keep pattern="org.guiceyfruit.**" />
+ </jarjar>
+ <delete dir="${project.build.outputDirectory}" />
+ <unjar
src="${project.build.directory}/${project.build.finalName}-jarjar.jar"
dest="${project.build.outputDirectory}">
+ <patternset>
+ <include name="**/*.class" />
+ <exclude name="*" />
+ </patternset>
+ </unjar>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ -->
+ </plugins>
+ </build>
+</project>
Added: james/server/trunk/stage/org.guiceyfruit/poms/guice-jsr250-2.0-beta-4.pom
URL:
http://svn.apache.org/viewvc/james/server/trunk/stage/org.guiceyfruit/poms/guice-jsr250-2.0-beta-4.pom?rev=825954&view=auto
==============================================================================
--- james/server/trunk/stage/org.guiceyfruit/poms/guice-jsr250-2.0-beta-4.pom
(added)
+++ james/server/trunk/stage/org.guiceyfruit/poms/guice-jsr250-2.0-beta-4.pom
Fri Oct 16 15:41:00 2009
@@ -0,0 +1,46 @@
+<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";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.guiceyfruit</groupId>
+ <artifactId>guice</artifactId>
+ <version>2.0-beta-4</version>
+ </parent>
+ <groupId>org.guiceyfruit</groupId>
+ <artifactId>guice-jsr250</artifactId>
+ <version>2.0-beta-4</version>
+ <packaging>jar</packaging>
+ <name>guice-spring</name>
+ <dependencies>
+
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>guice-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <!-- tests -->
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>guiceyfruit-core</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-all</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+</project>
Modified: james/server/trunk/stage/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/stage/pom.xml?rev=825954&r1=825953&r2=825954&view=diff
==============================================================================
--- james/server/trunk/stage/pom.xml (original)
+++ james/server/trunk/stage/pom.xml Fri Oct 16 15:41:00 2009
@@ -386,7 +386,22 @@
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
-
+
+ <dependency>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.guiceyfruit</groupId>
+ <artifactId>guice-jsr250</artifactId>
+ <version>2.0-beta-4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.guiceyfruit</groupId>
+ <artifactId>guice-core</artifactId>
+ <version>2.0-beta-4</version>
+ </dependency>
</dependencies>
<build>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
