diff --git a/build.xml b/build.xml
index 2c46f19a1..89b88b1b4 100644
--- a/build.xml
+++ b/build.xml
@@ -439,6 +439,7 @@
+
@@ -454,6 +455,7 @@
+
@@ -470,6 +472,7 @@
+
@@ -477,10 +480,11 @@
-
-
+
+
+
diff --git a/changelog.txt b/changelog.txt
index 0fe476f73..f2dfeb14a 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -2,7 +2,31 @@ SPRING MODULES CHANGELOG
========================
http://springmodules.dev.java.net
-Changes in version 0.1 (20.05.2005)
+Changes in version 0.2 (21.05.2005)
+-----------------------------------
+
+Package org.springmodules.cache
+* Moved Wanghy Cache into Spring Modules
+
+Package org.springmodules.cache.annotations
+* Introduced annotations support for Spring Modules Cache
+
+Package org.springmodules.workflow
+* Introduced the root WorkflowException.
+
+Package org.springmodules.workflow.osworkflow
+* Added OsWorkflowTemplate for simplifying interaction with the OSWorkflow framework.
+* Added OsWorkflowContext and OsWorkflowContextHolder for managing contextual information on a per-thread basis.
+
+Package org.springmodules.workflow.osworklow.support
+* Added AcegiRoleCondition to allow for actions to be restricted based on the Acegi role of the current user.
+
+Package org.springmodules.workflow.osworkflow.web
+* Added AbstractWorkflowContextHandlerInterceptor to transparently manage OSWorkflow caller and workflow instance context.
+* Added DefaultWorkflowContextHandlerInterceptor to transparently map OSWorkflow caller to current Prinicpal when using container-managed security.
+* Added AcegiWorkflowContextHandlerInterceptor to transparently map OSWorkflow caller to current Acegi authenticated user.
+
+Changes in version 0.1 (20.04.2005)
-----------------------------------
Package org.springmodules.commons.validator
diff --git a/project.properties b/project.properties
index 21aeea1a2..65a83796c 100644
--- a/project.properties
+++ b/project.properties
@@ -34,6 +34,10 @@ 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
diff --git a/samples/osworkflow/osworkflow.iml b/samples/osworkflow/osworkflow.iml
index 6e8be5e9d..70bcf0810 100644
--- a/samples/osworkflow/osworkflow.iml
+++ b/samples/osworkflow/osworkflow.iml
@@ -12,10 +12,11 @@
+
-
+
@@ -24,7 +25,7 @@
-
+
@@ -33,7 +34,7 @@
-
+
@@ -42,7 +43,7 @@
-
+
@@ -60,7 +61,7 @@
-
+
@@ -69,7 +70,7 @@
-
+
@@ -84,16 +85,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -106,7 +97,7 @@
-
+
@@ -187,8 +178,8 @@
-
- jar://$MODULE_DIR$/../../lib/dwr/dwr-0.4.jar!/
+
+ jar://$MODULE_DIR$/../../lib/dwr/dwr-0.5.jar!/
diff --git a/samples/osworkflow/src/java/org/springmodules/examples/workflow/osworkflow/web/EditDocumentForm.java b/samples/osworkflow/src/java/org/springmodules/examples/workflow/osworkflow/web/EditDocumentForm.java
index 7e5b4b6ef..d06f5955f 100644
--- a/samples/osworkflow/src/java/org/springmodules/examples/workflow/osworkflow/web/EditDocumentForm.java
+++ b/samples/osworkflow/src/java/org/springmodules/examples/workflow/osworkflow/web/EditDocumentForm.java
@@ -39,7 +39,7 @@ protected Object formBackingObject(HttpServletRequest httpServletRequest) throws
protected ModelAndView onSubmit(Object command) throws Exception {
Document document = (Document) command;
this.workflow.uploadDocument(document);
- return new ModelAndView(new RedirectView("/approval/status"));
+ return new ModelAndView(new RedirectView("../status"));
}
diff --git a/samples/osworkflow/src/java/org/springmodules/examples/workflow/osworkflow/web/PassBackForm.java b/samples/osworkflow/src/java/org/springmodules/examples/workflow/osworkflow/web/PassBackForm.java
index 392c5bda6..1fff4d5d7 100644
--- a/samples/osworkflow/src/java/org/springmodules/examples/workflow/osworkflow/web/PassBackForm.java
+++ b/samples/osworkflow/src/java/org/springmodules/examples/workflow/osworkflow/web/PassBackForm.java
@@ -26,6 +26,6 @@ public void setWorkflow(DocumentApprovalWorkflow workflow) {
protected ModelAndView onSubmit(Object command) throws Exception {
this.workflow.passBack((Comment) command);
- return new ModelAndView(new RedirectView("/approval/status"));
+ return new ModelAndView(new RedirectView("../status"));
}
}
diff --git a/samples/osworkflow/src/web/WEB-INF/applicationContext.xml b/samples/osworkflow/src/web/WEB-INF/applicationContext.xml
index 512fc4d4a..454cc10dd 100644
--- a/samples/osworkflow/src/web/WEB-INF/applicationContext.xml
+++ b/samples/osworkflow/src/web/WEB-INF/applicationContext.xml
@@ -10,9 +10,6 @@
documentApproval
-
-