Permalink
Browse files

Merge branch 'master' of git://github.com/astubbs/spring-modules

Conflicts:
	pom.xml
	projects/pom.xml
	projects/spring-modules-cache/pom.xml
  • Loading branch information...
2 parents eb2b062 + be954f8 commit 45c943befe27aefb9cc83ce6ceb5463dd8904f89 @thetoolman thetoolman committed Apr 15, 2010
Showing with 894 additions and 8,809 deletions.
  1. +0 −7 .classpath
  2. +7 −3 .gitignore
  3. +0 −23 .project
  4. +88 −0 README.mdown
  5. +0 −3 build/.cvsignore
  6. +0 −47 build/build-continuous.xml
  7. +0 −17 build/build.properties
  8. +0 −485 build/build.xml
  9. +0 −5 build/custom-resolver.xml
  10. +0 −17 build/ivy.xml
  11. +0 −22 build/readme.txt
  12. +166 −130 pom.xml
  13. +0 −99 project.properties
  14. +0 −5 projects/.classpath
  15. +1 −0 projects/.gitignore
  16. +0 −23 projects/.project
  17. +0 −22 projects/ant/.classpath
  18. +0 −17 projects/ant/.project
  19. +0 −19 projects/aop/.classpath
  20. +0 −17 projects/aop/.project
  21. +0 −11 projects/common-build/.project
  22. +0 −13 projects/common-build/templates/projects/basic/.classpath
  23. +0 −17 projects/common-build/templates/projects/basic/.project
  24. +0 −33 projects/common-build/templates/projects/standard/.classpath
  25. +0 −17 projects/common-build/templates/projects/standard/.project
  26. +0 −43 projects/commons/.classpath
  27. +0 −17 projects/commons/.project
  28. +0 −18 projects/db4o/.classpath
  29. +0 −2 projects/db4o/.cvsignore
  30. +0 −17 projects/db4o/.project
  31. +0 −12 projects/db4o/.settings/org.eclipse.jdt.core.prefs
  32. +0 −15 projects/db4o/build.xml
  33. +0 −6 projects/db4o/custom-resolver.xml
  34. +0 −4 projects/db4o/docs/reference/src/authors.xml
  35. +0 −227 projects/db4o/docs/reference/src/db4o.xml
  36. +0 −1 projects/db4o/docs/reference/src/images/do.not.delete.txt
  37. +0 −16 projects/db4o/docs/reference/src/index.xml
  38. +0 −42 projects/db4o/ivy.xml
  39. +0 −28 projects/db4o/pom.xml
  40. +0 −5 projects/db4o/project.properties
  41. +0 −8 projects/db4o/src/etc/test-resources/log4j.properties
  42. 0 projects/db4o/src/etc/test-resources/testdb.file
  43. +0 −525 projects/db4o/src/java/org/springmodules/db4o/ConfigurationFactoryBean.java
  44. +0 −67 projects/db4o/src/java/org/springmodules/db4o/Db4oAccessor.java
  45. +0 −31 projects/db4o/src/java/org/springmodules/db4o/Db4oCallback.java
  46. +0 −101 projects/db4o/src/java/org/springmodules/db4o/Db4oOperations.java
  47. +0 −31 projects/db4o/src/java/org/springmodules/db4o/Db4oSystemException.java
  48. +0 −600 projects/db4o/src/java/org/springmodules/db4o/Db4oTemplate.java
  49. +0 −287 projects/db4o/src/java/org/springmodules/db4o/Db4oTransactionManager.java
  50. +0 −337 projects/db4o/src/java/org/springmodules/db4o/ObjectClassFactoryBean.java
  51. +0 −195 projects/db4o/src/java/org/springmodules/db4o/ObjectContainerFactoryBean.java
  52. +0 −37 projects/db4o/src/java/org/springmodules/db4o/ObjectContainerHolder.java
  53. +0 −208 projects/db4o/src/java/org/springmodules/db4o/ObjectFieldFactoryBean.java
  54. +0 −182 projects/db4o/src/java/org/springmodules/db4o/ObjectServerFactoryBean.java
  55. +0 −54 projects/db4o/src/java/org/springmodules/db4o/ObjectServerUtils.java
  56. +0 −94 projects/db4o/src/java/org/springmodules/db4o/support/Db4oDaoSupport.java
  57. +0 −174 projects/db4o/src/test/org/springmodules/db4o/ConfigurationFactoryBeanTests.java
  58. +0 −602 projects/db4o/src/test/org/springmodules/db4o/Db4oTemplateTests.java
  59. +0 −171 projects/db4o/src/test/org/springmodules/db4o/Db4oTransactionManagerTests.java
  60. +0 −302 projects/db4o/src/test/org/springmodules/db4o/ObjectClassFactoryBeanTests.java
  61. +0 −71 projects/db4o/src/test/org/springmodules/db4o/ObjectContainerFactoryBeanTests.java
  62. +0 −217 projects/db4o/src/test/org/springmodules/db4o/ObjectFieldFactoryBeanTests.java
  63. +0 −61 projects/db4o/src/test/org/springmodules/db4o/ObjectServerFactoryBeanTests.java
  64. +0 −87 projects/db4o/src/test/org/springmodules/db4o/support/Db4oDaoSupportTests.java
  65. +0 −21 projects/flux/.classpath
  66. +0 −17 projects/flux/.project
  67. +0 −29 projects/hivemind/.classpath
  68. +0 −2 projects/hivemind/.cvsignore
  69. +0 −17 projects/hivemind/.project
  70. +0 −15 projects/hivemind/build.xml
  71. +0 −5 projects/hivemind/custom-resolver.xml
  72. +0 −9 projects/hivemind/docs/reference/src/authors.xml
  73. +0 −93 projects/hivemind/docs/reference/src/hivemind.xml
  74. +0 −1 projects/hivemind/docs/reference/src/images/do.not.delete.txt
  75. +0 −16 projects/hivemind/docs/reference/src/index.xml
  76. +0 −48 projects/hivemind/ivy.xml
  77. +0 −23 projects/hivemind/pom.xml
  78. +0 −5 projects/hivemind/project.properties
  79. +0 −18 projects/hivemind/src/etc/test-resources/META-INF/hivemodule.xml
  80. +0 −13 projects/hivemind/src/etc/test-resources/org/springmodules/hivemind/hivemodule.xml
  81. +0 −280 projects/hivemind/src/java/org/springmodules/hivemind/RegistryFactoryBean.java
  82. +0 −140 projects/hivemind/src/java/org/springmodules/hivemind/ServiceFactoryBean.java
  83. +0 −18 projects/hivemind/src/java/org/springmodules/hivemind/package.html
  84. +0 −10 projects/hivemind/src/test/org/springmodules/hivemind/FooService.java
  85. +0 −12 projects/hivemind/src/test/org/springmodules/hivemind/FooServiceFour.java
  86. +0 −12 projects/hivemind/src/test/org/springmodules/hivemind/FooServiceOne.java
  87. +0 −12 projects/hivemind/src/test/org/springmodules/hivemind/FooServiceThree.java
  88. +0 −12 projects/hivemind/src/test/org/springmodules/hivemind/FooServiceTwo.java
  89. +0 −10 projects/hivemind/src/test/org/springmodules/hivemind/MessageService.java
  90. +0 −18 projects/hivemind/src/test/org/springmodules/hivemind/MockMessageService.java
  91. +0 −114 projects/hivemind/src/test/org/springmodules/hivemind/RegistryFactoryBeanTests.java
  92. +0 −94 projects/hivemind/src/test/org/springmodules/hivemind/ServiceFactoryBeanTests.java
  93. +0 −101 projects/hivemind/src/test/org/springmodules/hivemind/ServiceFactoryBeanWithConfigLocationTests.java
  94. +0 −6 projects/javaspace/.classpath
  95. +0 −17 projects/javaspace/.project
  96. +0 −65 projects/javaspaces/.classpath
  97. +0 −17 projects/javaspaces/.project
  98. +0 −32 projects/jbpm30/.classpath
  99. +0 −17 projects/jbpm30/.project
  100. +0 −32 projects/jbpm31/.classpath
  101. +0 −17 projects/jbpm31/.project
  102. +0 −50 projects/jcr/.classpath
  103. +0 −17 projects/jcr/.project
  104. +0 −28 projects/jsr94/.classpath
  105. +0 −17 projects/jsr94/.project
  106. +0 −35 projects/lucene/.classpath
  107. +0 −17 projects/lucene/.project
  108. +0 −19 projects/ojb/.classpath
  109. +0 −17 projects/ojb/.project
  110. +0 −14 projects/orbroker/.classpath
  111. +0 −17 projects/orbroker/.project
  112. +0 −31 projects/osworkflow/.classpath
  113. +0 −17 projects/osworkflow/.project
  114. +22 −24 projects/pom.xml
  115. +0 −7 projects/spring-jbpm31/.classpath
  116. +0 −17 projects/spring-jbpm31/.project
  117. +0 −32 projects/spring-modules-cache/.classpath
  118. +0 −21 projects/spring-modules-cache/.project
  119. +177 −78 projects/spring-modules-cache/pom.xml
  120. +12 −1 ...s-cache/src/main/java/org/springmodules/cache/interceptor/caching/AbstractCachingInterceptor.java
  121. +53 −0 projects/spring-modules-cache/src/main/java/org/springmodules/cache/key/MultiKeyCodeGenerator.java
  122. 0 ...ache/src/main/{java → resources}/org/springmodules/cache/config/ehcache/springmodules-ehcache.xsd
  123. 0 ...rc/main/{java → resources}/org/springmodules/cache/config/gigaspaces/springmodules-gigaspaces.xsd
  124. 0 ...es-cache/src/main/{java → resources}/org/springmodules/cache/config/jboss/springmodules-jboss.xsd
  125. 0 ...odules-cache/src/main/{java → resources}/org/springmodules/cache/config/jcs/springmodules-jcs.xsd
  126. 0 ...ache/src/main/{java → resources}/org/springmodules/cache/config/oscache/springmodules-oscache.xsd
  127. 0 ...-modules-cache/src/main/{java → resources}/org/springmodules/cache/config/springmodules-cache.xsd
  128. +330 −314 ...ing-modules-cache/src/test/java/org/springmodules/cache/config/CacheSetupStrategyParserTests.java
  129. +24 −0 ...cts/spring-modules-cache/src/test/java/org/springmodules/cache/key/MultiKeyCodeGeneratorTest.java
  130. +5 −1 projects/spring-modules-cache/src/test/java/org/springmodules/cache/util/ReflectionsTest.java
  131. +0 −6 projects/spring-modules-cache/src/test/resources/META-INF/spring.handlers
  132. +0 −7 projects/spring-modules-cache/src/test/resources/META-INF/spring.schemas
  133. +1 −0 projects/spring-modules-cache/src/test/resources/gs.properties
  134. +8 −0 projects/spring-modules-cache/src/test/resources/gslicense.xml
  135. 0 ...g-modules-cache/src/test/{java → resources}/org/springmodules/cache/config/fakeConfigLocation.xml
  136. 0 ...dules-cache/src/test/{java → resources}/org/springmodules/cache/provider/cacheProvider.properties
  137. 0 ...odules-cache/src/test/{java → resources}/org/springmodules/cache/provider/jboss/cache-service.xml
  138. 0 ...ing-modules-cache/src/test/{java → resources}/org/springmodules/cache/provider/jcs/jcs-config.ccf
  139. 0 ...he/src/test/{java → resources}/org/springmodules/cache/provider/oscache/oscache-config.properties
  140. 0 projects/spring-modules-cache/src/test/{java → resources}/policy
  141. +0 −19 projects/springmvc-extra/.classpath
  142. +0 −30 projects/springmvc-extra/.project
  143. +0 −24 projects/tapestry/.classpath
  144. +0 −17 projects/tapestry/.project
  145. +0 −25 projects/template/.classpath
  146. +0 −30 projects/template/.project
  147. +0 −4 projects/xml-rpc/.classpath
  148. +0 −17 projects/xml-rpc/.project
  149. +0 −25 projects/xt/.classpath
  150. +0 −30 projects/xt/.project
  151. +0 −18 samples/db4o/pilot/.classpath
  152. +0 −17 samples/db4o/pilot/.project
  153. +0 −69 samples/db4o/recipemanager/.classpath
  154. +0 −30 samples/db4o/recipemanager/.project
  155. +0 −59 samples/feed-xt/.classpath
  156. +0 −34 samples/feed-xt/.project
  157. +0 −42 samples/jcr/.classpath
  158. +0 −17 samples/jcr/.project
  159. +0 −29 samples/jsr94/.classpath
  160. +0 −17 samples/jsr94/.project
  161. +0 −124 samples/osworkflow/.classpath
  162. +0 −30 samples/osworkflow/.project
View
@@ -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
@@ -1,3 +1,7 @@
-.project
-.classpath
-.settings
+#eclipse ignores:
+.settings
+.project
+.classpath
+target
+/projects/spring-modules-cache/logs/gigaspaces0_0.log
+bin
View
@@ -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
@@ -0,0 +1,88 @@
+# Welcome to SpringModules Fork!
+
+This is a resurrection of the extremely valuable and abandoned Spring-Modules project.
+
+The plan is to fully embrace Maven as the build tool and eventually throw out all the old build code.
+
+At this point, all the old jar libraries and _generated_ documentation have been pruned from the repository history.
+This pruning has reduced the size of the repository from 95m to 7m. Nice.
+
+The idea will be to slowly add one by one, as the are compile ready, to the parent module section, so they can be included.
+
+Remember, you can add issues to git-hub, and you can link them to the Jira issues. Ideally we need admin access to the SpringModules Jira, but that's a long shot. So, if there's a patch in Jira you want us to apply, create a git-hub issue for it.
+
+Msg/email me on antony.stubbs@gmail.com to discuss!
+
+# Mailing List
+
+Here are the essentials:
+
+* Group name: spring-modules-fork
+* Group home page: http://groups.google.com/group/spring-modules-fork
+* Group email address spring-modules-fork@googlegroups.com
+
+# Questions
+
+* Shall we change the name, or at least the Maven groupId?
+
+# Release
+
+Finally! After over a year of waiting, we are starting to release SNAPSHOT versions of 0.10. ATM, only the cache module has a 0.10-SNAPSHOT version. However, as we receive patches for other modules, those will get releases too.
+
+## Repository
+
+The releases are being hosted on my own server - so please, be nice and use a proxy like Nexus!
+
+Add this to your pom.xml:
+
+ <repositories>
+ <repository>
+ <id>sharca.com.repo</id>
+ <name>SharcaConsulting Repository</name>
+ <url>http://www.sharca.com/repository</url>
+ </repository>
+ </repositories>
+
+And use this as a dependency:
+
+ <dependency>
+ <groupId>org.springmodules</groupId>
+ <artifactId>spring-modules-cache</artifactId>
+ <version>0.10-SNAPSHOT</version>
+ </dependency>
+
+# Goals
+
+* Any module in this release will be built completely in with Maven
+* Apply the most annoying patches from Jira
+
+## So Far
+
+* anounced: http://stubbisms.wordpress.com/2009/07/08/spring-modules-fork/
+* uploaded
+* cache module migrated to Maven
+* all pom's applied from the patch under MOD-463 with some fixes
+* jar's and generated documentation removed
+* upgraded to Spring 2.5
+
+# Submitting Patches
+
+You have several options.
+
+The best option is to use git like it's intended, and commit to your local repo, push up to yoru github account and send a pull request, or talk about your feature branch on the mailing list.
+
+Otherwise, you can still generate patches using:
+
+* git format-patch origin
+
+And again, email the files to the mailing list or an issue on git-hub.
+
+But, if you don't want to get too involved with git pushing etc, then:
+
+ install git (If you're on windows, I suggest using git through cygwin. Mac I suggest installing git with MacPorts)
+ run git clone git://github.com/astubbs/spring-modules.git
+
+Make your changes - i.e. edit the code, apply a patch off of jira site etc...
+
+ git diff > my.patch
+ email the patch to the mailing list, or attach to an issue on git-hub
View
@@ -1,3 +0,0 @@
-data
-target
-lib
View
@@ -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
@@ -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.
Oops, something went wrong.

0 comments on commit 45c943b

Please sign in to comment.