Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge remote branch 'origin/master'

Attempt to fix conflicts between pablotdl and davidkarlsen's

Conflicts:
	.gitignore
	pom.xml
	projects/pom.xml
	projects/spring-modules-cache/pom.xml
  • Loading branch information...
commit d9e8e0bc4045a89fbbe2fdcb935dfd44609cff23 2 parents b87654c + 2fa3344
@astubbs authored
Showing with 868 additions and 8,698 deletions.
  1. +0 −7 .classpath
  2. +2 −2 .gitignore
  3. +0 −23 .project
  4. +0 −3  build/.cvsignore
  5. +0 −47 build/build-continuous.xml
  6. +0 −17 build/build.properties
  7. +0 −485 build/build.xml
  8. +0 −5 build/custom-resolver.xml
  9. +0 −17 build/ivy.xml
  10. +0 −22 build/readme.txt
  11. +323 −288 pom.xml
  12. +0 −99 project.properties
  13. +1 −0  projects/.gitignore
  14. +0 −22 projects/ant/.classpath
  15. +0 −17 projects/ant/.project
  16. +0 −19 projects/aop/.classpath
  17. +0 −17 projects/aop/.project
  18. +0 −11 projects/common-build/.project
  19. +0 −13 projects/common-build/templates/projects/basic/.classpath
  20. +0 −17 projects/common-build/templates/projects/basic/.project
  21. +0 −33 projects/common-build/templates/projects/standard/.classpath
  22. +0 −17 projects/common-build/templates/projects/standard/.project
  23. +0 −43 projects/commons/.classpath
  24. +0 −17 projects/commons/.project
  25. +0 −18 projects/db4o/.classpath
  26. +0 −2  projects/db4o/.cvsignore
  27. +0 −17 projects/db4o/.project
  28. +0 −12 projects/db4o/.settings/org.eclipse.jdt.core.prefs
  29. +0 −15 projects/db4o/build.xml
  30. +0 −6 projects/db4o/custom-resolver.xml
  31. +0 −4 projects/db4o/docs/reference/src/authors.xml
  32. +0 −227 projects/db4o/docs/reference/src/db4o.xml
  33. +0 −1  projects/db4o/docs/reference/src/images/do.not.delete.txt
  34. +0 −16 projects/db4o/docs/reference/src/index.xml
  35. +0 −42 projects/db4o/ivy.xml
  36. +0 −28 projects/db4o/pom.xml
  37. +0 −5 projects/db4o/project.properties
  38. +0 −8 projects/db4o/src/etc/test-resources/log4j.properties
  39. 0  projects/db4o/src/etc/test-resources/testdb.file
  40. +0 −525 projects/db4o/src/java/org/springmodules/db4o/ConfigurationFactoryBean.java
  41. +0 −67 projects/db4o/src/java/org/springmodules/db4o/Db4oAccessor.java
  42. +0 −31 projects/db4o/src/java/org/springmodules/db4o/Db4oCallback.java
  43. +0 −101 projects/db4o/src/java/org/springmodules/db4o/Db4oOperations.java
  44. +0 −31 projects/db4o/src/java/org/springmodules/db4o/Db4oSystemException.java
  45. +0 −600 projects/db4o/src/java/org/springmodules/db4o/Db4oTemplate.java
  46. +0 −287 projects/db4o/src/java/org/springmodules/db4o/Db4oTransactionManager.java
  47. +0 −337 projects/db4o/src/java/org/springmodules/db4o/ObjectClassFactoryBean.java
  48. +0 −195 projects/db4o/src/java/org/springmodules/db4o/ObjectContainerFactoryBean.java
  49. +0 −37 projects/db4o/src/java/org/springmodules/db4o/ObjectContainerHolder.java
  50. +0 −208 projects/db4o/src/java/org/springmodules/db4o/ObjectFieldFactoryBean.java
  51. +0 −182 projects/db4o/src/java/org/springmodules/db4o/ObjectServerFactoryBean.java
  52. +0 −54 projects/db4o/src/java/org/springmodules/db4o/ObjectServerUtils.java
  53. +0 −94 projects/db4o/src/java/org/springmodules/db4o/support/Db4oDaoSupport.java
  54. +0 −174 projects/db4o/src/test/org/springmodules/db4o/ConfigurationFactoryBeanTests.java
  55. +0 −602 projects/db4o/src/test/org/springmodules/db4o/Db4oTemplateTests.java
  56. +0 −171 projects/db4o/src/test/org/springmodules/db4o/Db4oTransactionManagerTests.java
  57. +0 −302 projects/db4o/src/test/org/springmodules/db4o/ObjectClassFactoryBeanTests.java
  58. +0 −71 projects/db4o/src/test/org/springmodules/db4o/ObjectContainerFactoryBeanTests.java
  59. +0 −217 projects/db4o/src/test/org/springmodules/db4o/ObjectFieldFactoryBeanTests.java
  60. +0 −61 projects/db4o/src/test/org/springmodules/db4o/ObjectServerFactoryBeanTests.java
  61. +0 −87 projects/db4o/src/test/org/springmodules/db4o/support/Db4oDaoSupportTests.java
  62. +0 −21 projects/flux/.classpath
  63. +0 −17 projects/flux/.project
  64. +0 −29 projects/hivemind/.classpath
  65. +0 −2  projects/hivemind/.cvsignore
  66. +0 −17 projects/hivemind/.project
  67. +0 −15 projects/hivemind/build.xml
  68. +0 −5 projects/hivemind/custom-resolver.xml
  69. +0 −9 projects/hivemind/docs/reference/src/authors.xml
  70. +0 −93 projects/hivemind/docs/reference/src/hivemind.xml
  71. +0 −1  projects/hivemind/docs/reference/src/images/do.not.delete.txt
  72. +0 −16 projects/hivemind/docs/reference/src/index.xml
  73. +0 −48 projects/hivemind/ivy.xml
  74. +0 −23 projects/hivemind/pom.xml
  75. +0 −5 projects/hivemind/project.properties
  76. +0 −18 projects/hivemind/src/etc/test-resources/META-INF/hivemodule.xml
  77. +0 −13 projects/hivemind/src/etc/test-resources/org/springmodules/hivemind/hivemodule.xml
  78. +0 −280 projects/hivemind/src/java/org/springmodules/hivemind/RegistryFactoryBean.java
  79. +0 −140 projects/hivemind/src/java/org/springmodules/hivemind/ServiceFactoryBean.java
  80. +0 −18 projects/hivemind/src/java/org/springmodules/hivemind/package.html
  81. +0 −10 projects/hivemind/src/test/org/springmodules/hivemind/FooService.java
  82. +0 −12 projects/hivemind/src/test/org/springmodules/hivemind/FooServiceFour.java
  83. +0 −12 projects/hivemind/src/test/org/springmodules/hivemind/FooServiceOne.java
  84. +0 −12 projects/hivemind/src/test/org/springmodules/hivemind/FooServiceThree.java
  85. +0 −12 projects/hivemind/src/test/org/springmodules/hivemind/FooServiceTwo.java
  86. +0 −10 projects/hivemind/src/test/org/springmodules/hivemind/MessageService.java
  87. +0 −18 projects/hivemind/src/test/org/springmodules/hivemind/MockMessageService.java
  88. +0 −114 projects/hivemind/src/test/org/springmodules/hivemind/RegistryFactoryBeanTests.java
  89. +0 −94 projects/hivemind/src/test/org/springmodules/hivemind/ServiceFactoryBeanTests.java
  90. +0 −101 projects/hivemind/src/test/org/springmodules/hivemind/ServiceFactoryBeanWithConfigLocationTests.java
  91. +0 −6 projects/javaspace/.classpath
  92. +0 −17 projects/javaspace/.project
  93. +0 −65 projects/javaspaces/.classpath
  94. +0 −17 projects/javaspaces/.project
  95. +0 −32 projects/jbpm30/.classpath
  96. +0 −17 projects/jbpm30/.project
  97. +0 −50 projects/jcr/.classpath
  98. +0 −17 projects/jcr/.project
  99. +0 −28 projects/jsr94/.classpath
  100. +0 −17 projects/jsr94/.project
  101. +0 −19 projects/ojb/.classpath
  102. +0 −17 projects/ojb/.project
  103. +0 −14 projects/orbroker/.classpath
  104. +0 −17 projects/orbroker/.project
  105. +0 −31 projects/osworkflow/.classpath
  106. +0 −17 projects/osworkflow/.project
  107. +12 −12 projects/pom.xml
  108. +0 −7 projects/spring-jbpm31/.classpath
  109. +0 −17 projects/spring-jbpm31/.project
  110. +0 −10 projects/spring-modules-cache/.classpath
  111. +0 −29 projects/spring-modules-cache/.project
  112. +109 −62 projects/spring-modules-cache/pom.xml
  113. +53 −0 projects/spring-modules-cache/src/main/java/org/springmodules/cache/key/MultiKeyCodeGenerator.java
  114. 0  ...les-cache/src/main/{java → resources}/org/springmodules/cache/config/ehcache/springmodules-ehcache.xsd
  115. 0  ...che/src/main/{java → resources}/org/springmodules/cache/config/gigaspaces/springmodules-gigaspaces.xsd
  116. 0  ...modules-cache/src/main/{java → resources}/org/springmodules/cache/config/jboss/springmodules-jboss.xsd
  117. 0  ...ing-modules-cache/src/main/{java → resources}/org/springmodules/cache/config/jcs/springmodules-jcs.xsd
  118. 0  ...les-cache/src/main/{java → resources}/org/springmodules/cache/config/oscache/springmodules-oscache.xsd
  119. 0  ...pring-modules-cache/src/main/{java → resources}/org/springmodules/cache/config/springmodules-cache.xsd
  120. +330 −314 projects/spring-modules-cache/src/test/java/org/springmodules/cache/config/CacheSetupStrategyParserTests.java
  121. +24 −0 projects/spring-modules-cache/src/test/java/org/springmodules/cache/key/MultiKeyCodeGeneratorTest.java
  122. +5 −1 projects/spring-modules-cache/src/test/java/org/springmodules/cache/util/ReflectionsTest.java
  123. +0 −6 projects/spring-modules-cache/src/test/resources/META-INF/spring.handlers
  124. +0 −7 projects/spring-modules-cache/src/test/resources/META-INF/spring.schemas
  125. +1 −0  projects/spring-modules-cache/src/test/resources/gs.properties
  126. +8 −0 projects/spring-modules-cache/src/test/resources/gslicense.xml
  127. 0  ...spring-modules-cache/src/test/{java → resources}/org/springmodules/cache/config/fakeConfigLocation.xml
  128. 0  ...ng-modules-cache/src/test/{java → resources}/org/springmodules/cache/provider/cacheProvider.properties
  129. 0  ...ing-modules-cache/src/test/{java → resources}/org/springmodules/cache/provider/jboss/cache-service.xml
  130. 0  ...s/spring-modules-cache/src/test/{java → resources}/org/springmodules/cache/provider/jcs/jcs-config.ccf
  131. 0  ...s-cache/src/test/{java → resources}/org/springmodules/cache/provider/oscache/oscache-config.properties
  132. 0  projects/spring-modules-cache/src/test/{java → resources}/policy
  133. +0 −24 projects/tapestry/.classpath
  134. +0 −17 projects/tapestry/.project
  135. +0 −33 projects/validation/.classpath
  136. +0 −30 projects/validation/.project
  137. +0 −4 projects/xml-rpc/.classpath
  138. +0 −17 projects/xml-rpc/.project
  139. +0 −18 samples/db4o/pilot/.classpath
  140. +0 −17 samples/db4o/pilot/.project
  141. +0 −69 samples/db4o/recipemanager/.classpath
  142. +0 −30 samples/db4o/recipemanager/.project
  143. +0 −59 samples/feed-xt/.classpath
  144. +0 −34 samples/feed-xt/.project
  145. +0 −42 samples/jcr/.classpath
  146. +0 −17 samples/jcr/.project
  147. +0 −29 samples/jsr94/.classpath
  148. +0 −17 samples/jsr94/.project
  149. +0 −124 samples/osworkflow/.classpath
  150. +0 −30 samples/osworkflow/.project
View
7 .classpath
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/hibernate"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
View
4 .gitignore
@@ -2,5 +2,5 @@ target
.settings
.classpath
.project
-
-
+/projects/spring-modules-cache/logs/gigaspaces0_0.log
+bin
View
23 .project
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>spring-modules</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
View
3  build/.cvsignore
@@ -1,3 +0,0 @@
-data
-target
-lib
View
47 build/build-continuous.xml
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<!--
- =======================================================================
- Build file containing targets for continuously integrating build
- =======================================================================
--->
-<project name="build-spring-springmodules-continuous" default="upload" xmlns:ivy="antlib:fr.jayasoft.ivy.ant"
- xmlns:aws="antlib:org.springframework.aws">
-
- <import file="${basedir}/build.xml"/>
-
- <!-- targets for uploading binaries, creating snapshots, et cetera -->
- <target name="upload" depends="upload-s3"/>
-
- <target name="upload-s3" depends="init, s3.tasks, guard.s3.accessKey, guard.s3.secretKey">
- <tstamp>
- <format property="tstamp" pattern="yyyyMMdd"/>
- </tstamp>
- <aws:s3 accessKey="${s3.accessKey}" secretKey="${s3.secretKey}">
- <upload bucketName="dist.springframework.org"
- file="${target.release.dir}/${release.zip}"
- toFile="snapshot/MOD/spring-modules-${release.version}-${tstamp}-${build.number}.zip"
- publicRead="true"/>
- </aws:s3>
- </target>
-
- <target name="guard.s3.accessKey" unless ="s3.accessKey">
- <fail message="This target requires the s3.accesskey property to be set"/>
- </target>
-
- <target name="guard.s3.secretKey" unless ="s3.secretKey">
- <fail message="This target requires the s3.secretKey property to be set"/>
- </target>
-
- <target name="s3.tasks">
- <ivy:configure file="${common.build.dir}/ivyconf.xml" />
- <property name="main.build.configs" value="global,buildtime,test" />
- <ivy:resolve file="${basedir}/ivy.xml" conf="${main.build.configs}" />
- <ivy:retrieve pattern="${ivy.retrieve.pattern}" conf="${main.build.configs}" />
- <path id="aws.lib.path">
- <fileset dir="${basedir}/lib/global" includes="*.jar"/>
- </path>
- <taskdef resource="org/springframework/aws/antlib.xml" uri="antlib:org.springframework.aws"
- classpathref="aws.lib.path" />
- </target>
-
-</project>
View
17 build/build.properties
@@ -1,17 +0,0 @@
-# configurable property values, may be locally overriden by a build.properties file
-release.version=0.9
-
-#include.sandbox=true
-
-# The location of the common build system
-common.build.dir=${basedir}/../projects/common-build
-docs.dir=${basedir}/../docs
-# common build bootstrap
-bootstrap.dir=${basedir}/../projects/common-build-bootstrap
-
-project.base.version=${release.version}
-project.name=spring-modules-${release.version}
-org.package.prefix=org.springmodules
-org.name=springmodules.dev.java.net
-
-copyright=Copyright &#169; 2005-2008. The Spring Modules Project. All Rights Reserved.
View
485 build/build.xml
@@ -1,485 +0,0 @@
-<?xml version="1.0"?>
-<!--
- ==========================================================================
- A master build file for creating a release of Spring Modules (customised after Spring WebFlow)
- ==========================================================================
--->
-<project name="build-spring-modules" default="release"
- xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
-
- <!-- Load local and user build preferences -->
- <property file="build.properties"/>
- <property file="project.properties"/>
- <property file="${user.home}/build.properties"/>
- <property file="${common.build.dir}/build.properties"/>
- <property file="${common.build.dir}/project.properties"/>
-
- <!-- try to load ivy here from local lib dir, in case the user has not already dropped
- it into ant's lib dir (note that the latter copy will always take precedence).
- We will not fail as long as local lib dir exists (it may be empty) and
- ivy is in at least one of ant's lib dir or the local lib dir. -->
- <path id="ivy.lib.path">
- <fileset dir="${common.build.dir}/lib" includes="*.jar"/>
- </path>
-
- <taskdef resource="fr/jayasoft/ivy/ant/antlib.xml"
- uri="antlib:fr.jayasoft.ivy.ant" classpathref="ivy.lib.path"/>
-
- <!-- simplistic pattern for zipping up sources -->
- <selector id="project.source.zip.includes">
- <or>
- <filename name="common-build/**"/>
- <and>
- <or>
- <filename name="build-spring-webflow/**"/>
- <filename name="spring-binding/**"/>
- <filename name="spring-webflow/**"/>
- <filename name="spring-webflow-samples/**"/>
- </or>
- <and>
- <!-- exclude core project derived artifacts -->
- <filename name="*/docs/**" negate="true"/>
- <filename name="*/target/**" negate="true"/>
- <filename name="*/build.properties" negate="true"/>
- <filename name="*/lib/**" negate="true"/>
- </and>
- <and>
- <!-- exclude sample project derived artifacts -->
- <filename name="*/*/docs/**" negate="true"/>
- <filename name="*/*/target/**" negate="true"/>
- <filename name="*/*/build.properties" negate="true"/>
- <filename name="*/*/lib/**" negate="true"/>
- </and>
- </and>
- </or>
- </selector>
-
- <!--
- targets: displays all targets suitable for developer use
- -->
- <target name="targets">
- <echo>
- Master build for Spring Modules.
- Please execute ant -p
- to see a list of all relevant targets. The default target is 'main' </echo>
- </target>
-
- <!--
- init: initializes some common settings
- -->
- <target name="init" unless="init.done" depends="init.pre, init.post"/>
-
- <target name="init.pre">
-
-
- <!-- ivy will determine the right order to build web flow main and samples -->
-
- <property name="ivy.conf.dir" value="${common.build.dir}"/>
-
- <ivy:configure file="${ivy.conf.dir}/ivyconf.xml"/>
-
- <ivy:buildlist reference="modules">
- <fileset dir="..">
-
- <exclude name="projects/common-build/build.xml"/>
- <exclude name="projects/common-build-bootstrap/build.xml"/>
- <include name="projects/*/build.xml"/>
-
- <!-- not building
- <exclude name="projects/cache/build.xml" />
- <exclude name="projects/jbpm30/build.xml" />
- <exclude name="projects/jbpm31/build.xml" />
- <exclude name="projects/jsr94/build.xml" />
- <exclude name="projects/lucene/build.xml" />
- <exclude name="projects/tapestry/build.xml" />
- -->
-
- <!-- sandbox -->
- <include name="sandbox/*/build.xml" if="include.sandbox"/>
- <!-- exclude from sandbox -->
-
- </fileset>
- </ivy:buildlist>
-
- <tstamp>
- <format property="build.timestamp" pattern="yyyyMMddHHmmss"/>
- </tstamp>
- <tstamp>
- <format property="TSTAMPCOL" pattern="hh:mm"/>
- </tstamp>
-
-
- <!-- default the release version (used in release archive zips) to the current timestamp -->
- <property name="release.version" value="${build.timestamp}"/>
-
- <!-- root of build hierarchy -->
- <property name="target.dir" value="${basedir}/target"/>
-
- <!-- directory for release zips -->
- <property name="target.release.dir" value="${target.dir}/release"/>
-
- <!-- directory for Maven2 bundles zips -->
- <property name="target.m2-bundles.dir" value="${target.dir}/m2-bundles"/>
-
- <!-- directory for release zips -->
- <property name="zip.toplevel.dir"
- value="spring-modules-${release.version}"/>
- <property name="release.zip"
- value="spring-modules-${release.version}.zip"/>
-
- <echo message='user.dir = "${user.dir}"'/>
- <echo message='ant.file = "${ant.file}"'/>
- <echo message='ant.java.version = "${ant.java.version}"'/>
- <echo message='release.version = "${release.version}"'/>
-
- </target>
-
- <target name="init.post">
- <property name="projects" value="modules"/>
- <property name="projects.names" refid="modules"/>
- <property name="init.done" value="true"/>
- </target>
-
- <target name="clean" depends="init"
- description="Cleans all build output files from all projects">
- <delete dir="${target.dir}"/>
- <echo>projects=${projects}</echo>
- <echo>projects.names=${projects.names}</echo>
- <subant target="clean" inheritall="false" failonerror="false">
- <buildpath refid="${projects}"/>
- </subant>
-
- </target>
-
- <target name="clean-all" depends="init"
- description="Cleans all build output files from all projects, and also retrieved libs">
- <delete dir="${target.dir}"/>
- <echo>projects=${projects}</echo>
- <subant target="clean-all" inheritall="false" failonerror="false">
- <buildpath refid="${projects}"/>
- </subant>
- </target>
-
- <target name="publish" depends="init"
- description="Calls publish targets on each project">
- <echo>projects=${projects}</echo>
- <subant target="publish" inheritall="false" failonerror="false">
- <buildpath refid="${projects}"/>
- </subant>
- </target>
-
- <target name="dist" depends="init,dist.task,dist.fail,dist.clean"
- description="Calls dist targets on each project"/>
-
- <target name="dist.clean" unless="subant.fail">
- <delete file="${basedir}/fail.log"/>
- </target>
-
- <target name="dist.task">
-
- <echo>projects=${projects}</echo>
- <delete file="${basedir}/fail.log"/>
-
- <record name="${basedir}/fail.log" action="start"/>
- <subant target="dist" inheritall="false" failonerror="false">
- <buildpath refid="${projects}"/>
- </subant>
- <record name="${basedir}/fail.log" action="stop"/>
-
- <condition property="subant.fail">
- <isfileselected file="${basedir}/fail.log">
- <contains text="Failure for target"/>
- </isfileselected>
- </condition>
-
- </target>
-
- <target name="dist.fail" if="subant.fail">
- <concat>
- <filelist dir="${basedir}" files="fail.log"/>
- <header filtering="no" trimleading="yes">
- Failures Summary:
- =================
- </header>
- <filterchain>
- <linecontains>
- <contains value="Failure for target"/>
- </linecontains>
- </filterchain>
- </concat>
- <fail if="subant.fail"
- message="Oops, there was a failure: see ${basedir}/fail.log for details."/>
- <delete file="${basedir}/fail.log"/>
- </target>
-
- <target name="build-release-repo" depends="init"
- description="Builds repo of all dependencies for all projects">
- <echo>projects=${projects}</echo>
- <subant target="retrieve-to-repo" inheritall="false">
- <property name="retrieve.to.repo.dir" value="${target.dir}/repo"/>
- <property name="retrieve.to.repo.pattern"
- value="${release.repo.ivy.retrieve.pattern}"/>
- <property name="retrieve.to.repo.pattern.ivy"
- value="${release.repo.ivy.retrieve.ivy.pattern}"/>
- <buildpath refid="${projects}"/>
- </subant>
- </target>
-
- <target name="tests" depends="init"
- description="Calls test targets on each project">
- <echo>projects=${projects}</echo>
- <subant target="tests" inheritall="false" failonerror="true">
- <buildpath refid="${projects}"/>
- </subant>
- </target>
-
- <target name="tests-dist" depends="init"
- description="Calls tests-dist targets on each project">
- <echo>projects=${projects}</echo>
- <subant target="tests-dist" inheritall="false" failonerror="true">
- <buildpath refid="${projects}"/>
- </subant>
- </target>
-
- <target name="javadoc" depends="init"
- description="Calls javadoc targets on each project">
- <echo>projects=${projects}</echo>
- <subant target="javadoc" inheritall="false" failonerror="false">
- <buildpath refid="${projects}"/>
- </subant>
- </target>
-
- <target name="doc" depends="init"
- description="Calls doc targets on applicable projects">
- <echo>projects=${projects}</echo>
- <subant target="doc-all" inheritall="false" failonerror="false">
- <buildpath refid="${projects}"/>
- </subant>
-
- <!-- generate documentation for the entire project -->
- <ant antfile="${docs.dir}/build.xml" dir="${docs.dir}"/>
- </target>
-
- <target name="m2-bundle" depends="init"
- description="Calls m2-bundle target on each project">
- <echo>projects=${projects}</echo>
- <mkdir dir="${target.m2-bundles.dir}"/>
- <subant target="m2-bundle" inheritall="false" failonerror="false">
- <buildpath refid="${projects}"/>
- </subant>
- <copy todir="${target.m2-bundles.dir}">
- <fileset file="../projects/ant/target/m2-bundle/*.jar"/>
- <fileset file="../projects/aop/target/m2-bundle/*.jar"/>
- <fileset file="../projects/cache/target/m2-bundle/*.jar"/>
- <fileset file="../projects/commons/target/m2-bundle/*.jar"/>
- <fileset file="../projects/flux/target/m2-bundle/*.jar"/>
- <fileset file="../projects/hivemind/target/m2-bundle/*.jar"/>
- <fileset file="../projects/javaspaces/target/m2-bundle/*.jar"/>
- <fileset file="../projects/jbpm30/target/m2-bundle/*.jar"/>
- <fileset file="../projects/jbpm31/target/m2-bundle/*.jar"/>
- <fileset file="../projects/jcr/target/m2-bundle/*.jar"/>
- <fileset file="../projects/jsr94/target/m2-bundle/*.jar"/>
- <fileset file="../projects/lucene/target/m2-bundle/*.jar"/>
- <fileset file="../projects/ojb/target/m2-bundle/*.jar"/>
- <fileset file="../projects/orbroker/target/m2-bundle/*.jar"/>
- <fileset file="../projects/osworkflow/target/m2-bundle/*.jar"/>
- <fileset file="../projects/springmvc-extra/target/m2-bundle/*.jar"/>
- <fileset file="../projects/tapestry/target/m2-bundle/*.jar"/>
- <fileset file="../projects/template/target/m2-bundle/*.jar"/>
- <fileset file="../projects/validation/target/m2-bundle/*.jar"/>
- <fileset file="../projects/xt/target/m2-bundle/*.jar"/>
- </copy>
- </target>
-
- <target name="m2-clean" depends="init"
- description="Calls m2-clean target on each project">
- <echo>projects=${projects}</echo>
- <delete dir="${target.m2-bundles.dir}"/>
- <subant target="m2-clean" inheritall="false" failonerror="false">
- <buildpath refid="${projects}"/>
- </subant>
- </target>
-
- <target name="get.scb" description="Retrieve spring common build">
- <ant antfile="${bootstrap.dir}/build.xml" dir="${bootstrap.dir}"/>
- </target>
-
- <target name="tomcat-copy-war" depends="init"
- description="Copies all war to tomcat webapp dir">
- <echo>projects=${projects}</echo>
- <subant target="tomcat-copy-war" inheritall="false" failonerror="no">
- <buildpath refid="${projects}"/>
- </subant>
- </target>
- <!--
- <target name="release" depends="dist, build-release-repo, javadoc, doc, gen.release.zip"
- -->
- <target name="release" depends="dist, javadoc, doc, gen.release.zip"
- description="Generate the springmodules release archive"/>
-
- <target name="gen.release.jar" depends="init">
- <!-- create jar -->
- <copy todir="${target.release.dir}/tmp/jar">
- <fileset dir="../projects/" includes="**/target/classes/**/*"
- excludes="**/*.html"/>
- <mapper type="regexp" from="^(.*)classes(.*)$$" to="\2"/>
- </copy>
- <jar destfile="${target.release.dir}/tmp/${zip.toplevel.dir}-all.jar"
- basedir="${target.release.dir}/tmp/jar" includes="**/*"/>
- <delete dir="${target.release.dir}/tmp/jar" failonerror="false"/>
- </target>
-
- <target name="gen.release.javadoc" depends="init">
- <!-- copy sources under one folder -->
- <copy todir="${target.release.dir}/tmp/sources">
- <fileset dir="../projects/"
- includes="**/src/java/**/*.java,**/src/java/**/package.html"/>
- <mapper type="regexp" from="^(.*)org(.*)$$" to="org\\\2"/>
- </copy>
-
- <javadoc destdir="${target.release.dir}/tmp/javadocs" author="true"
- version="true" windowtitle="${project.name} API"
- doctitle="${project.name}" bottom="${copyright}">
- <sourcepath>
- <pathelement location="${target.release.dir}/tmp/sources"/>
- </sourcepath>
- <packageset dir="${target.release.dir}/tmp/sources">
- <include name="**/*"/>
- </packageset>
- </javadoc>
- </target>
-
- <target name="gen.release.samples" depends="init">
- <property name="tmp.samples.dir"
- value="${target.release.dir}/tmp/samples"/>
- <mkdir dir="${tmp.samples.dir}"/>
-
- <zip
- destfile="${tmp.samples.dir}/spring-modules-hivemind-samples-src.zip">
- <fileset dir="${common.build.dir}/../../samples/hivemind/src">
- <exclude name="test/**"/>
- </fileset>
- </zip>
-
- <zip destfile="${tmp.samples.dir}/spring-modules-jcr-samples-src.zip">
- <fileset dir="${common.build.dir}/../../samples/jcr/src">
- <exclude name="test/**"/>
- </fileset>
- </zip>
-
- <zip destfile="${tmp.samples.dir}/spring-modules-jsr94-samples-src.zip">
- <fileset dir="${common.build.dir}/../../samples/jsr94/src">
- <exclude name="test/**"/>
- </fileset>
- </zip>
-
- <zip destfile="${tmp.samples.dir}/spring-modules-lucene-samples-src.zip">
- <fileset dir="${common.build.dir}/../../samples/lucene/src">
- <exclude name="test/**"/>
- </fileset>
- </zip>
-
- <zip
- destfile="${tmp.samples.dir}/spring-modules-osworkflow-samples-src.zip">
- <fileset dir="${common.build.dir}/../../samples/osworkflow/src">
- <exclude name="test/**"/>
- </fileset>
- </zip>
-
- <zip
- destfile="${tmp.samples.dir}/spring-modules-validation-bean-samples-src.zip">
- <fileset
- dir="${common.build.dir}/../../samples/validation/validation-bean/src">
- <exclude name="test/**"/>
- </fileset>
- </zip>
-
- <zip
- destfile="${tmp.samples.dir}/spring-modules-validation-commons-samples-src.zip">
- <fileset
- dir="${common.build.dir}/../../samples/validation/validation-commons/src">
- <exclude name="test/**"/>
- </fileset>
- </zip>
-
- <zip
- destfile="${tmp.samples.dir}/spring-modules-validation-valang-samples-src.zip">
- <fileset
- dir="${common.build.dir}/../../samples/validation/validation-valang/src">
- <exclude name="test/**"/>
- </fileset>
- </zip>
-
- <zip destfile="${tmp.samples.dir}/spring-modules-xt-samples-src.zip">
- <fileset dir="${common.build.dir}/../../samples/xt/src">
- <exclude name="test/**"/>
- </fileset>
- </zip>
-
- <zip destfile="${tmp.samples.dir}/spring-modules-feed-xt-src.zip">
- <fileset dir="${common.build.dir}/../../samples/feed-xt/src">
- <exclude name="test/**"/>
- </fileset>
- </zip>
-
- <zip
- destfile="${tmp.samples.dir}/spring-modules-orm-petclinic-samples-src.zip">
- <fileset dir="${common.build.dir}/../../samples/orm-petclinic">
- <include name="db/**"/>
- <include name="src/**"/>
- <include name="war/**"/>
- </fileset>
- </zip>
- </target>
-
- <target name="gen.release.zip"
- depends="init, gen.release.jar, gen.release.javadoc, gen.release.samples">
- <!-- -->
- <delete file="${target.release.dir}" failonerror="false"/>
- <mkdir dir="${target.release.dir}"/>
- <delete file="${target.release.dir}/${release.zip}"/>
-
- <copy todir="${target.release.dir}/tmp">
- <fileset dir="../projects/" includes="**/target/artifacts/lib/*"/>
- <mapper type="flatten"/>
- </copy>
-
- <zip zipfile="${target.release.dir}/${release.zip}">
- <!-- important readme, license, and other text files -->
- <zipfileset file="../changelog.txt" prefix="${zip.toplevel.dir}"/>
- <!-- binary files -->
- <zipfileset dir="${target.release.dir}/tmp" includes="**/*.jar"
- prefix="${zip.toplevel.dir}"/>
-
- <!-- sources -->
- <zipfileset dir="${target.release.dir}/tmp" excludes="samples/**"
- includes="**/*-src.zip" prefix="${zip.toplevel.dir}/sources"/>
-
- <!-- javadocs -->
- <zipfileset dir="${target.release.dir}/tmp/javadocs" includes="**/*"
- prefix="${zip.toplevel.dir}/docs/javadoc"/>
-
- <!--
- <zipfileset dir="../projects/**/target/dist/ivys" prefix="${zip.toplevel.dir}" />
-
- <zipfileset dir="../projects/" includes="**/target/javadocs/**/*"
- prefix="${zip.toplevel.dir}/docs/api" />
- -->
- <!-- docs -->
- <zipfileset dir="./target/docs/reference"
- prefix="${zip.toplevel.dir}/docs/reference">
- </zipfileset>
-
- <!-- samples -->
- <zipfileset dir="${target.release.dir}/tmp/samples"
- includes="**/*-src.zip"
- prefix="${zip.toplevel.dir}/samples/sources"/>
-
- <zipfileset dir="../projects/repository"
- prefix="${zip.toplevel.dir}/repository"/>
-
- </zip>
- <delete dir="${target.release.dir}/tmp" failonerror="false"/>
- </target>
-
-</project>
View
5 build/custom-resolver.xml
@@ -1,5 +0,0 @@
-<ivyconf>
- <resolvers>
- <chain name="custom"/>
- </resolvers>
-</ivyconf>
View
17 build/ivy.xml
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ivy-module version="1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jayasoft.org/misc/ivy/samples/ivy.xsd">
-
- <info organisation="org.springmodules" module="build" />
-
- <configurations>
- <conf name="default" extends="global" />
- <conf name="global" visibility="private" />
- <conf name="buildtime" visibility="private" />
- <conf name="test" visibility="private" />
- </configurations>
-
- <dependencies defaultconf="global->default">
- <dependency org="org.springframework.aws" name="spring-aws-ant" rev="1.0.2"/>
- </dependencies>
-</ivy-module>
View
22 build/readme.txt
@@ -1,22 +0,0 @@
-Doing a release
---------------------
-1. update build/build.properties and /docs/reference/src/index-module.xml with the release dates
- update projects/common-build/project.properties (w/ release name (0.x))
-
-2. test that everything is fine
- ant clean-all release
- see target/ folder
- -- check that the docs are properly generated (including html and pdf)
- -- check packages, including javadocs, sources and changelog
-
-3. upload the jar without the full distro
-5. create a new version on JIRA and close the existing one
-6. do the version release on JIRA
-7. commit the 0.x docs on the CVS website
-7.5. do a CVS tag
-7.8. update the version in the various files (see step 1) to 0.x+1-DEV
-8. update the project page
-
-9. post the announcement on the forum and then on Spring Framework site.
-
-
View
611 pom.xml
@@ -9,23 +9,56 @@
<properties>
<version.spring>2.5.6</version.spring>
- <version.easymock>2.4</version.easymock>
+ <version.easymock>2.5.2</version.easymock>
+ <project.build.java.target>1.5</project.build.java.target>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
+ <profiles>
+ <profile>
+ <id>eclipse</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.7</version>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ <downloadJavadocs>true</downloadJavadocs>
+ <wtpversion>1.5</wtpversion>
+ <ajdtVersion>none</ajdtVersion>
+ <!--
+ see: http://jira.codehaus.org/browse/MECLIPSE-558 and
+ http://jira.codehaus.org/browse/MECLIPSE-594
+ -->
+ <additionalProjectnatures>
+ <projectnature>org.springframework.ide.eclipse.core.springnature</projectnature>
+ </additionalProjectnatures>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
<modules>
<module>projects</module>
<!--
- <module>docs</module>
- <module>www</module>
- <module>samples</module>
- <module>sandbox</module>
- -->
+ <module>docs</module> <module>www</module> <module>samples</module>
+ <module>sandbox</module>
+ -->
</modules>
<scm>
<url>http://github.com/astubbs/spring-modules/tree/master</url>
</scm>
+ <ciManagement>
+ <system>Hudson</system>
+ <url>sharca.com:8080</url>
+ </ciManagement>
+
<distributionManagement>
<repository>
<id>sharca.com.repo</id>
@@ -34,34 +67,19 @@
</repository>
</distributionManagement>
- <dependencies>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- <version>${version.spring}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.6</version>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>${version.easymock}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <version>${version.easymock}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
<dependencyManagement>
<dependencies>
- <!-- Common -->
+ <!-- Common -->
+ <dependency>
+ <groupId>commons-attributes</groupId>
+ <artifactId>commons-attributes-api</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.1</version>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
@@ -87,272 +105,273 @@
<artifactId>spring-aop</artifactId>
<version>${version.spring}</version>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-webmvc</artifactId>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
<version>${version.spring}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>${version.spring}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.6</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>${version.easymock}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <version>${version.easymock}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- <version>2.0.8</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
- <!-- Cache -->
- <dependency>
- <groupId>opensymphony</groupId>
- <artifactId>oscache</artifactId>
- <version>2.3</version>
- </dependency>
- <dependency>
- <groupId>gigaspaces</groupId>
- <artifactId>gigaspaces-ce</artifactId>
- <version>5.2-1706</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache</artifactId>
- <version>1.6.0</version>
- </dependency>
- <dependency>
- <groupId>tangosol</groupId>
- <artifactId>tangosol-coherence</artifactId>
- <version>3.3-rc1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jcs</groupId>
- <artifactId>jcs</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-cache</artifactId>
- <version>1.4.1.GA</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-system</artifactId>
- <version>4.0.2</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-jmx</artifactId>
- <version>4.0.2</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>jgroups</groupId>
- <artifactId>jgroups</artifactId>
- <version>2.2.5</version>
- <optional>true</optional>
- </dependency>
- <!--Lucene -->
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
- <version>2.0.0</version>
- </dependency>
- <dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- <version>3.0</version>
- </dependency>
- <dependency>
- <groupId>pdfbox</groupId>
- <artifactId>pdfbox</artifactId>
- <version>0.7.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi</artifactId>
- <version>3.1-FINAL</version>
- </dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-scratchpad</artifactId>
- <version>3.1-FINAL</version>
- </dependency>
- <dependency>
- <groupId>jexcelapi</groupId>
- <artifactId>jxl</artifactId>
- <version>2.6</version>
- </dependency>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.7</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>aspectjweaver</artifactId>
- <version>1.6.5</version>
- <scope>test</scope>
- </dependency>
- <!-- Spring MVC extras -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>rome</groupId>
- <artifactId>rome</artifactId>
- <version>0.9</version>
- </dependency>
- <!-- XT -->
- <dependency>
- <groupId>org.springmodules</groupId>
- <artifactId>spring-modules-template</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.json-lib</groupId>
- <artifactId>json-lib</artifactId>
- <version>0.9</version>
- </dependency>
- <dependency>
- <groupId>xmlunit</groupId>
- <artifactId>xmlunit</artifactId>
- <version>1.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock-junit3</artifactId>
- <version>2.5.1</version>
- <scope>test</scope>
- </dependency>
- <!-- JBPM -->
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>3.2.6.ga</version>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jbpm</artifactId>
- <version>3.1.4</version>
- </dependency>
- <!-- Template -->
- <dependency>
- <groupId>velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.5</version>
- </dependency>
- <dependency>
- <groupId>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
- <version>2.3.11</version>
- </dependency>
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4.1</version>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy</artifactId>
- <version>1.5.1</version>
- </dependency>
- <dependency>
- <groupId>dumbster</groupId>
- <artifactId>dumbster</artifactId>
- <version>1.6</version>
- </dependency>
- <!-- Validation -->
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>1.5.1</version>
- </dependency>
- <dependency>
- <groupId>commons-validator</groupId>
- <artifactId>commons-validator</artifactId>
- <version>1.3.1</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.acegisecurity</groupId>
- <artifactId>acegi-security</artifactId>
- <version>1.0.5</version>
- <!-- TODO: Exclude spring 1.x transitive dependencies -->
- </dependency>
- <dependency>
- <groupId>antlr</groupId>
- <artifactId>antlr</artifactId>
- <version>2.7.7</version>
- </dependency>
- <dependency>
- <groupId>ognl</groupId>
- <artifactId>ognl</artifactId>
- <version>2.7.1</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.6</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>${version.easymock}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <version>${version.easymock}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <version>2.0.8</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ <!-- Cache -->
+ <dependency>
+ <groupId>opensymphony</groupId>
+ <artifactId>oscache</artifactId>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>gigaspaces</groupId>
+ <artifactId>gigaspaces-ce</artifactId>
+ <version>5.2-1706</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ <version>1.6.0</version>
+ </dependency>
+ <dependency>
+ <groupId>tangosol</groupId>
+ <artifactId>tangosol-coherence</artifactId>
+ <version>3.3-rc1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jcs</groupId>
+ <artifactId>jcs</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-cache</artifactId>
+ <version>1.4.1.GA</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-system</artifactId>
+ <version>4.0.2</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-jmx</artifactId>
+ <version>4.0.2</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>jgroups</groupId>
+ <artifactId>jgroups</artifactId>
+ <version>2.2.5</version>
+ <optional>true</optional>
+ </dependency>
+ <!--Lucene -->
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ <version>3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>pdfbox</groupId>
+ <artifactId>pdfbox</artifactId>
+ <version>0.7.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi</artifactId>
+ <version>3.1-FINAL</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-scratchpad</artifactId>
+ <version>3.1-FINAL</version>
+ </dependency>
+ <dependency>
+ <groupId>jexcelapi</groupId>
+ <artifactId>jxl</artifactId>
+ <version>2.6</version>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.7</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjweaver</artifactId>
+ <version>1.6.5</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- Spring MVC extras -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>rome</groupId>
+ <artifactId>rome</artifactId>
+ <version>0.9</version>
+ </dependency>
+ <!-- XT -->
+ <dependency>
+ <groupId>org.springmodules</groupId>
+ <artifactId>spring-modules-template</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.json-lib</groupId>
+ <artifactId>json-lib</artifactId>
+ <version>0.9</version>
+ </dependency>
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <version>1.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock-junit3</artifactId>
+ <version>2.5.1</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- JBPM -->
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <version>3.2.6.ga</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jbpm</artifactId>
+ <version>3.1.4</version>
+ </dependency>
+ <!-- Template -->
+ <dependency>
+ <groupId>velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>1.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>2.3.11</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy</artifactId>
+ <version>1.5.1</version>
+ </dependency>
+ <dependency>
+ <groupId>dumbster</groupId>
+ <artifactId>dumbster</artifactId>
+ <version>1.6</version>
+ </dependency>
+ <!-- Validation -->
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>1.5.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-validator</groupId>
+ <artifactId>commons-validator</artifactId>
+ <version>1.3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.acegisecurity</groupId>
+ <artifactId>acegi-security</artifactId>
+ <version>1.0.5</version>
+ <!-- TODO: Exclude spring 1.x transitive dependencies -->
+ </dependency>
+ <dependency>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <version>2.7.7</version>
+ </dependency>
+ <dependency>
+ <groupId>ognl</groupId>
+ <artifactId>ognl</artifactId>
+ <version>2.7.1</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
+ <version>2.1.1</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -367,10 +386,26 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
+ <configuration>
+ <includes>
+ <!-- defaults: -->
+ <include>**/Test*.java</include>
+ <include>**/*Test.java</include>
+ <include>**/*TestCase.java</include>
+ <!-- added: -->
+ <include>**/*Tests.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.1</version>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>${project.build.java.target}</source>
+ <target>${project.build.java.target}</target>
</configuration>
</plugin>
</plugins>
@@ -383,6 +418,6 @@
<name>SharcaConsulting Repository</name>
<url>http://sharca.com/repository</url>
</repository>
- </repositories>
+ </repositories>
</project>
View
99 project.properties
@@ -1,99 +0,0 @@
-# Ant and Maven properties for building the Spring framework
-
-# Values in this file will be overridden by any values with the same name
-# in the user-created build.properties file.
-
-# Spring Modules title
-springmodules.title=Spring Modules
-
-# Default version number
-springmodules.version=dev-${DSTAMP}
-
-# Project name
-name=spring.modules
-
-# Compile with debug code
-debug=on
-
-# Library directory within project. Where third party jars reside.
-lib.dir=${basedir}/lib
-
-# Source directory under the current root
-src.dir=${basedir}/src/java
-
-# Test directory under the current root
-test.dir=${basedir}/src/test
-
-# Directory for generated API documentation -->
-javadocs.dir=${basedir}/docs/api
-
-# With the exception of 'dist' and 'docs/api', all artifacts produced by
-# the build go somewhere underneath the target dir
-target.dir=${basedir}/target
-
-# Main source tree will be compiled into this directory tree
-target.classes.dir=${target.dir}/classes
-
-# JDK 5.0 build settings
-tiger.src.dir=${basedir}/tiger/src
-tiger.test.dir=${basedir}/tiger/test
-
-# Test tree will be compiled into this directory tree
-target.testclasses.dir=${target.dir}/test-classes
-
-# Sandbox directory under the current root
-sandbox.dir=${basedir}/sandbox
-sandbox.src.dir=${basedir}/sandbox/src
-sandbox.test.dir=${basedir}/sandbox/test
-sandbox.target.dir=${target.dir}/sandbox
-sandbox.target.classes.dir=${sandbox.target.dir}/classes
-sandbox.target.testclasses.dir=${sandbox.target.dir}/test-classes
-sandbox.javadocs.dir=${basedir}/docs/sandbox/api
-
-# Clover configuration properties
-target.clover.dir=${target.dir}/clover
-clover.dbdir=${target.clover.dir}
-clover.dbfile=springmodules_coverage.db
-clover.initstring=${clover.dbdir}/${clover.dbfile}
-target.clover.html.dir=${target.dir}/clover-reports
-
-# Wildcards to be matched by JUnit tests
-# Convention is that our JUnit test classes have XXXTests-style names
-test.includes=**/*Tests.class
-
-# Wildcards to exclude among JUnit tests
-test.excludes=**/Abstract*
-
-# Directory where JUnit test reports are written
-target.junit.reports.dir=${target.dir}/test-reports
-sandbox.target.junit.reports.dir=${sandbox.target.dir}/test-reports
-
-# Directory where JUnit test summary is written
-target.junit.summary.dir=${target.dir}/test-summary
-sandbox.target.junit.summary.dir=${sandbox.target.dir}/test-summary
-
-# Directory we generate distribution units such as jars and zips to
-dist.dir=dist
-
-# Directory for Jakarta Commons Attributes to write generated Java code to
-commons.attributes.tempdir.src=${target.dir}/generated-commons-attributes-src
-commons.attributes.tempdir.test=${target.dir}/generated-commons-attributes-test
-commons.attributes.tempdir.sandbox.test=${target.dir}/generated-commons-attributes-sandbox.test
-
-# Directory for release Zips
-target.release.dir=${target.dir}/release
-
-# Zip file that gets created for a release
-release.zip=springmodules-${springmodules.version}.zip
-release-with-dependencies.zip=springmodules-${springmodules.version}-with-dependencies.zip
-
-# Path prefix within the Zip file
-release.path=springmodules-${springmodules.version}
-
-
-# ------------------------------------------------------------------------
-# docbook reference documentation
-# ------------------------------------------------------------------------
-doc.dir=docs
-doc.ref.dir=docs/reference
-dist.ref.dir=docs/reference
View
1  projects/.gitignore
@@ -0,0 +1 @@
+bin
View
22 projects/ant/.classpath
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/java"/>
- <classpathentry kind="src" path="src/test"/>
- <classpathentry kind="src" path="src/etc/resources"/>
- <classpathentry kind="src" path="src/etc/test-resources"/>
- <classpathentry kind="lib" path="lib/global/ant.jar"/>
- <classpathentry kind="lib" path="lib/global/commons-logging.jar"/>
- <classpathentry kind="lib" path="lib/global/ognl.jar"/>
- <classpathentry kind="lib" path="lib/global/spring-beans.jar"/>
- <classpathentry kind="lib" path="lib/global/spring-context.jar"/>
- <classpathentry kind="lib" path="lib/global/spring-core.jar"/>
- <classpathentry kind="lib" path="lib/test/ant-apache-bsf.jar"/>
- <classpathentry kind="lib" path="lib/test/bsf.jar"/>
- <classpathentry kind="lib" path="lib/test/jruby.jar"/>
- <classpathentry kind="lib" path="lib/test/junit.jar"/>
- <classpathentry kind="lib" path="lib/test/spring-beans.jar"/>
- <classpathentry kind="lib" path="lib/test/spring-context.jar"/>
- <classpathentry kind="lib" path="lib/test/spring-core.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="target/test-classes"/>
-</classpath>
View
17 projects/ant/.project
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>ant</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
View
19 projects/aop/.classpath
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/java"/>
- <classpathentry kind="src" path="src/test"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="lib/global/aopalliance.jar"/>
- <classpathentry kind="lib" path="lib/global/commons-logging.jar"/>
- <classpathentry kind="lib" path="lib/global/ognl.jar"/>
- <classpathentry kind="lib" path="lib/global/spring-aop.jar"/>
- <classpathentry kind="lib" path="lib/global/spring-aspects.jar"/>
- <classpathentry kind="lib" path="lib/global/spring-beans.jar"/>
- <classpathentry kind="lib" path="lib/global/spring-context.jar"/>
- <classpathentry kind="lib" path="lib/global/spring-core.jar"/>
- <classpathentry kind="lib" path="lib/global/spring-support.jar"/>
- <classpathentry kind="lib" path="lib/test/easymock.jar"/>
- <classpathentry kind="lib" path="lib/test/junit.jar"/>
- <classpathentry kind="lib" path="lib/test/spring-mock.jar"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
View
17 projects/aop/.project
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>aop</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
View
11 projects/common-build/.project
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>common-build</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- </buildSpec>
- <natures>
- </natures>
-</projectDescription>
View
13 projects/common-build/templates/projects/basic/.classpath
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry output="target/classes" kind="src" path="src/java"/>
- <classpathentry output="target/test-classes" kind="src" path="src/test"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="lib/global/commons-logging.jar"/>
- <classpathentry kind="lib" path="lib/global/log4j.jar"/>
- <classpathentry kind="lib" path="lib/global/spring.jar"/>
- <classpathentry kind="lib" path="lib/test/easymock.jar"/>
- <classpathentry kind="lib" path="lib/test/junit.jar"/>
- <classpathentry kind="lib" path="lib/test/spring-mock.jar"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
View
17 projects/common-build/templates/projects/basic/.project
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>@PROJECT_NAME@</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
View
33 projects/common-build/templates/projects/standard/.classpath
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry output="target/classes" kind="src" path="src/java"/>
- <classpathentry output="target/test-classes" kind="src" path="src/test"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="lib/global/acegi-security.jar"/>
- <classpathentry kind="lib" path="lib/global/antlr.jar"/>
- <classpathentry kind="lib" path="lib/global/cglib-full.jar"/>
- <classpathentry kind="lib" path="lib/global/commons-attributes-api.jar"/>
- <classpathentry kind="lib" path="lib/global/commons-beanutils.jar"/>
- <classpathentry kind="lib" path="lib/global/commons-collections.jar"/>
- <classpathentry kind="lib" path="lib/global/commons-dbcp.jar"/>
- <classpathentry kind="lib" path="lib/global/commons-lang.jar"/>
- <classpathentry kind="lib" path="lib/global/commons-logging.jar"/>
- <classpathentry kind="lib" path="lib/global/commons-pool.jar"/>
- <classpathentry kind="lib" path="lib/global/dom4j.jar"/>
- <classpathentry kind="lib" path="lib/global/ehcache.jar"/>
- <classpathentry kind="lib" path="lib/global/hibernate.jar"/>
- <classpathentry kind="lib" path="lib/global/log4j.jar"/>
- <classpathentry kind="lib" path="lib/global/postgresql-jdbc3.jar"/>
- <classpathentry kind="lib" path="lib/global/spring.jar"/>
- <classpathentry kind="lib" path="lib/global/spring-mock.jar"/>
- <classpathentry kind="lib" path="lib/buildtime/servlet-api.jar"/>
- <classpathentry kind="lib" path="lib/test/dbunit.jar"/>
- <classpathentry kind="lib" path="lib/test/easymock.jar"/>
- <classpathentry kind="lib" path="lib/test/junit.jar"/>
- <classpathentry kind="lib" path="lib/global/jstl.jar"/>
- <classpathentry kind="lib" path="lib/global/standard.jar"/>
- <classpathentry kind="lib" path="lib/global/displaytag.jar"/>
- <classpathentry kind="lib" path="lib/global/jta.jar"/>
- <classpathentry kind="lib" path="lib/global/oro.jar"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
View
17 projects/common-build/templates/projects/standard/.project
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>@PROJECT_NAME@</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
View
43 projects/commons/.classpath
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/java"/>
- <classpathentry kind="src" path="src/test"/>
- <classpathentry kind="src" path="src/etc/resources"/>
- <classpathentry kind="src" path="src/etc/test-resources"/>
- <classpathentry kind="lib" path="lib/buildtime/commons-chain.jar"/>
- <classpathentry kind="lib" path="lib/buildtime/commons-configuration.jar"/>
- <classpathentry kind="lib" path="lib/buildtime/commons-lang.jar"/>
- <classpathentry kind="lib" path="lib/buildtime/commons-logging.jar"/>
- <classpathentry kind="lib" path="lib/buildtime/commons-validator.jar"/>
- <classpathentry kind="lib" path="lib/buildtime/log4j.jar"/>
- <classpathentry kind="lib" path="lib/buildtime/servlet-api.jar"/>
- <classpathentry kind="lib" path="lib/global/commons-chain.jar"/>
- <classpathentry kind="lib" path="lib/global/commons-configuration.jar"/>
- <classpathentry kind="lib" path="lib/global/commons-lang.jar"/>
- <classpathentry kind="lib" path="lib/global/commons-logging.jar"/>
- <classpathentry kind="lib" path="lib/global/commons-validator.jar"/>
- <classpathentry kind="lib" path="lib/global/log4j.jar"/>
- <classpathentry kind="lib" path="lib/global/servlet-api.jar"/>
- <classpathentry kind="lib" path="lib/global/spring-beans.jar"/>
- <classpathentry kind="lib" path="lib/global/spring-context.jar"/>
- <classpathentry kind="lib" path="lib/global/spring-core.jar"/>
- <classpathentry kind="lib" path="lib/global/spring-support.jar"/>
- <classpathentry kind="lib" path="lib/global/spring-web.jar"/>
- <classpathentry kind="lib" path="lib/global/spring-webmvc.jar"/>
- <classpathentry kind="lib" path="lib/test/clover.jar"/>
- <classpathentry kind="lib" path="lib/test/commons-beanutils.jar"/>
- <classpathentry kind="lib" path="lib/test/commons-chain.jar"/>
- <classpathentry kind="lib" path="lib/test/commons-collections.jar"/>
- <classpathentry kind="lib" path="lib/test/commons-configuration.jar"/>
- <classpathentry kind="lib" path="lib/test/commons-digester.jar"/>
- <classpathentry kind="lib" path="lib/test/commons-lang.jar"/>
- <classpathentry kind="lib" path="lib/test/commons-logging.jar"/>
- <classpathentry kind="lib" path="lib/test/commons-validator.jar"/>
- <classpathentry kind="lib" path="lib/test/easymock.jar"/>
- <classpathentry kind="lib" path="lib/test/junit.jar"/>
- <classpathentry kind="lib" path="lib/test/log4j.jar"/>
- <classpathentry kind="lib" path="lib/test/servlet-api.jar"/>
- <classpathentry kind="lib" path="lib/test/spring-mock.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="target/test-classes"/>
-</classpath>
View
17 projects/commons/.project
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>commons</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
View
18 projects/db4o/.classpath
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/java"/>
- <classpathentry kind="src" path="src/test"/>
- <classpathentry kind="src" path="src/etc/test-resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="lib/global/cglib-nodep.jar"/>
- <classpathentry kind="lib" path="lib/global/commons-logging.jar"/>
- <classpathentry kind="lib" path="lib/global/db4o.jar"/>
- <classpathentry kind="lib" path="lib/global/log4j.jar"/>
- <classpathentry kind="lib" path="lib/global/spring-beans.jar"/>
- <classpathentry kind="lib" path="lib/global/spring-core.jar"/>
- <classpathentry kind="lib" path="lib/global/spring-dao.jar"/>
- <classpathentry kind="lib" path="lib/test/easymock.jar"/>
- <classpathentry kind="lib" path="lib/test/easymockclassextension.jar"/>
- <classpathentry kind="lib" path="lib/test/junit.jar"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
View
2  projects/db4o/.cvsignore
@@ -1,2 +0,0 @@
-target
-lib
View
17 projects/db4o/.project
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>db4o</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
View
12 projects/db4o/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +0,0 @@
-#Fri Jan 25 14:32:50 GMT 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3
View
15 projects/db4o/build.xml
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="spring-modules-db4o" default="dist">
- <property file="build.properties" />
- <property file="project.properties" />
- <property file="${common.build.dir}/build.properties" />
- <property file="${common.build.dir}/project.properties" />
- <property file="${user.home}/build.properties" />
-
- <import file="${common.build.dir}/common-targets.xml" />
- <import file="${common.build.dir}/clover-targets.xml" />
- <import file="${common.build.dir}/doc-targets.xml" />
- <import file="${common.build.dir}/m2-targets.xml" />
-
-</project>
View
6 projects/db4o/custom-resolver.xml
@@ -1,6 +0,0 @@
-<ivyconf>
- <resolvers>
- <chain name="custom">
- </chain>
- </resolvers>
-</ivyconf>
View
4 projects/db4o/docs/reference/src/authors.xml
@@ -1,4 +0,0 @@
-<author>
- <firstname>Costin</firstname>
- <surname>Leau</surname>
-</author>
View
227 projects/db4o/docs/reference/src/db4o.xml
@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<chapter id="db4o">
- <title>db4o</title>
-
- <sect1>
- <title>Introduction</title>
-
- <para>db4o module facilitates integration between Spring framework and
- <ulink url="http://www.db4o.com/about/productinformation/">db4o</ulink>,
- allowing easier resource management, DAO implementation support and
- transaction strategies. In many respects, this modules is similar in
- structure, naming and functionality to Spring core modules for Hibernate,
- JPA or JDO - users familiar with Spring data access packages should feel
- right at home when using db4o spring integration.</para>
-
- <para>As samples, a web application named <emphasis>Recipe
- Manager</emphasis> and some examples 'converted' from db4o distribution
- (mainly chapter 1) are available.</para>
- </sect1>
-
- <sect1>
- <title>Configuration</title>
-
- <para>Before being used, db4o has to be configured. db4o module makes it
- easy to externalize db4o configuration (be it client or server) from the
- application into Spring application context xml files, reducing the code
- base and allowing decoupling of application from the environment it runs
- in. The core class for creating db4o's <literal>ObjectContainer</literal>
- is the <literal>ObjectContainerFactoryBean</literal> . Based on the
- various parameter passed to it, the objectcontainer can be created from a
- db4o database file, from an <literal>ObjectServer</literal> or based on a
- <literal>Configuration</literal> object.</para>
-
- <sect2>
- <title>Configuring an ObjectContainer</title>
-
- <para>The FactoryBean will create <literal>ObjectContainer</literal>s
- based on its properties, using the algorithm below:</para>
-
- <orderedlist>
- <listitem>
- <para>if the databaseFile is set, a local file based client will be
- created</para>
- </listitem>
-
- <listitem>
- <para>if memoryFile is set, a local memory based client will be
- instantiated</para>
- </listitem>
-
- <listitem>
- <para>if a server property is set, a client
- <literal>ObjectContainer</literal> will be created within the VM
- using the given server object</para>
- </listitem>
-
- <listitem>
- <para>if all the above fail, a connection to a (possibly) remote
- machine will be opened using the hostName, port, user and password
- properties.</para>
- </listitem>
- </orderedlist>
-
- <para>For example in order to create a memory based file
- <literal>ObjectContainer</literal> , the following configuration can be
- used: <programlisting>&lt;bean id="memoryContainer" class="org.db4ospring.ObjectContainerFactoryBean"&gt;
- &lt;property name="memoryFile"&gt;
- &lt;bean class="com.db4o.ext.MemoryFile"/&gt;
- &lt;/property&gt;
-&lt;/bean&gt;</programlisting></para>
-
- <para>For an <literal>ObjectContainer</literal> connected to a (remote)
- server:</para>
-
- <programlisting>&lt;bean id="remoteServerContainer" class="org.db4ospring.ObjectContainerFactoryBean"&gt;
- &lt;property name="hostName" value="localhost"/&gt;
- &lt;property name="port" value="123"/&gt;
- &lt;property name="user" value="foo"/&gt;
- &lt;property name="password" value="bar"/&gt;
-&lt;/bean&gt;</programlisting>
-
- <para>While creating a database file based, local
- <literal>ObjectContainer</literal> can be achieved using a bean
- definition such as:</para>
-
- <programlisting>&lt;bean id="fileContainer" class="org.db4ospring.ObjectContainerFactoryBean"&gt;
- &lt;property name="databaseFile" value="classpath:db4o-file.db"/&gt;
-&lt;/bean&gt;</programlisting>
-