Skip to content

Commit 08bc7d8

Browse files
author
robh
committed
Updated build, polished OSWorkflow example and update changelog
1 parent 828dd69 commit 08bc7d8

File tree

12 files changed

+53
-38
lines changed

12 files changed

+53
-38
lines changed

‎build.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -439,6 +439,7 @@
439439
<delete file="${target.release.dir}/${release-with-dependencies.zip}"/>
440440

441441
<fileset id="main" dir=".">
442+
<exclude name="**/CVS/**/*"/>
442443
<include name="dist/*.jar"/>
443444
<include name="dist/*.dtd"/>
444445
<include name="dist/*.tld"/>
@@ -454,6 +455,7 @@
454455
<exclude name="docs/reference/html/**"/>
455456
<exclude name="docs/reference/pdf/images/**"/>
456457
<include name="samples/hivemind/**"/>
458+
<include name="samples/osworkflow/**"/>
457459
<include name="src/**"/>
458460
<include name="test/**"/>
459461
<include name="*.bat"/>
@@ -470,17 +472,19 @@
470472
<zipfileset refid="main" prefix="${release.path}"/>
471473
<zipfileset dir="." prefix="${release.path}">
472474
<include name="lib/*.txt"/>
475+
<include name="lib/acegi/**"/>
473476
<include name="lib/ant/**"/>
474477
<include name="lib/antlr/**"/>
475478
<include name="lib/aopalliance/**"/>
476479
<include name="lib/cglib/**"/>
477480
<include name="lib/drools/**"/>
478481
<include name="lib/easymock/**"/>
479482
<include name="lib/hivemind/**"/>
480-
<include name="lib/jakarta-commons/**"/>
481-
<include name="lib/j2ee/**"/>
483+
<include name="lib/j2ee/**"/>
484+
<include name="lib/jakarta-commons/**"/>
482485
<include name="lib/janino/**"/>
483486
<include name="lib/javassist/**"/>
487+
<include name="lib/jcs/**"/>
484488
<include name="lib/jsr94/**"/>
485489
<include name="lib/junit/**"/>
486490
<include name="lib/log4j/**"/>

‎changelog.txt

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,31 @@ SPRING MODULES CHANGELOG
22
========================
33
http://springmodules.dev.java.net
44

5-
Changes in version 0.1 (20.05.2005)
5+
Changes in version 0.2 (21.05.2005)
6+
-----------------------------------
7+
8+
Package org.springmodules.cache
9+
* Moved Wanghy Cache into Spring Modules
10+
11+
Package org.springmodules.cache.annotations
12+
* Introduced annotations support for Spring Modules Cache
13+
14+
Package org.springmodules.workflow
15+
* Introduced the root WorkflowException.
16+
17+
Package org.springmodules.workflow.osworkflow
18+
* Added OsWorkflowTemplate for simplifying interaction with the OSWorkflow framework.
19+
* Added OsWorkflowContext and OsWorkflowContextHolder for managing contextual information on a per-thread basis.
20+
21+
Package org.springmodules.workflow.osworklow.support
22+
* Added AcegiRoleCondition to allow for actions to be restricted based on the Acegi role of the current user.
23+
24+
Package org.springmodules.workflow.osworkflow.web
25+
* Added AbstractWorkflowContextHandlerInterceptor to transparently manage OSWorkflow caller and workflow instance context.
26+
* Added DefaultWorkflowContextHandlerInterceptor to transparently map OSWorkflow caller to current Prinicpal when using container-managed security.
27+
* Added AcegiWorkflowContextHandlerInterceptor to transparently map OSWorkflow caller to current Acegi authenticated user.
28+
29+
Changes in version 0.1 (20.04.2005)
630
-----------------------------------
731

832
Package org.springmodules.commons.validator

‎project.properties

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ target.dir=${basedir}/target
3434
# Main source tree will be compiled into this directory tree
3535
target.classes.dir=${target.dir}/classes
3636

37+
# JDK 5.0 build settings
38+
tiger.src.dir=${basedir}/tiger/src
39+
tiger.test.dir=${basedir}/tiger/test
40+
3741
# Test tree will be compiled into this directory tree
3842
target.testclasses.dir=${target.dir}/test-classes
3943

‎samples/osworkflow/osworkflow.iml

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@
1212
<orderEntry type="inheritedJdk" />
1313
<orderEntry type="sourceFolder" forTests="false" />
1414
<orderEntry type="library" name="Tomcat 5.0.28" level="application_server_libraries" />
15+
<orderEntry type="module" module-name="core" />
1516
<orderEntry type="module-library">
1617
<library>
1718
<CLASSES>
18-
<root url="jar://$MODULE_DIR$/../../lib/opensymphony/osworkflow-2.7.0.jar!/" />
19+
<root url="jar://$MODULE_DIR$/../../lib/aopalliance/aopalliance.jar!/" />
1920
</CLASSES>
2021
<JAVADOC />
2122
<SOURCES />
@@ -24,7 +25,7 @@
2425
<orderEntry type="module-library">
2526
<library>
2627
<CLASSES>
27-
<root url="jar://$MODULE_DIR$/../../lib/spring/spring.jar!/" />
28+
<root url="jar://$MODULE_DIR$/../../lib/jakarta-commons/commons-logging.jar!/" />
2829
</CLASSES>
2930
<JAVADOC />
3031
<SOURCES />
@@ -33,7 +34,7 @@
3334
<orderEntry type="module-library">
3435
<library>
3536
<CLASSES>
36-
<root url="jar://$MODULE_DIR$/../../lib/aopalliance/aopalliance.jar!/" />
37+
<root url="jar://$MODULE_DIR$/../../lib/cglib/cglib-nodep-2.1-dev.jar!/" />
3738
</CLASSES>
3839
<JAVADOC />
3940
<SOURCES />
@@ -42,7 +43,7 @@
4243
<orderEntry type="module-library">
4344
<library>
4445
<CLASSES>
45-
<root url="jar://$MODULE_DIR$/../../lib/opensymphony/propertyset-1.3-21Apr04.jar!/" />
46+
<root url="jar://$MODULE_DIR$/../../lib/opensymphony/osworkflow-2.7.0.jar!/" />
4647
</CLASSES>
4748
<JAVADOC />
4849
<SOURCES />
@@ -60,7 +61,7 @@
6061
<orderEntry type="module-library">
6162
<library>
6263
<CLASSES>
63-
<root url="jar://$MODULE_DIR$/../../lib/cglib/cglib-nodep-2.1-dev.jar!/" />
64+
<root url="jar://$MODULE_DIR$/../../lib/opensymphony/propertyset-1.3-21Apr04.jar!/" />
6465
</CLASSES>
6566
<JAVADOC />
6667
<SOURCES />
@@ -69,7 +70,7 @@
6970
<orderEntry type="module-library">
7071
<library>
7172
<CLASSES>
72-
<root url="jar://$MODULE_DIR$/../../lib/jakarta-commons/commons-logging.jar!/" />
73+
<root url="jar://$MODULE_DIR$/../../lib/spring/spring.jar!/" />
7374
</CLASSES>
7475
<JAVADOC />
7576
<SOURCES />
@@ -84,16 +85,6 @@
8485
<SOURCES />
8586
</library>
8687
</orderEntry>
87-
<orderEntry type="module" module-name="springmodules" />
88-
<orderEntry type="module-library">
89-
<library>
90-
<CLASSES>
91-
<root url="jar://$MODULE_DIR$/../../lib/jakarta-taglibs/standard.jar!/" />
92-
</CLASSES>
93-
<JAVADOC />
94-
<SOURCES />
95-
</library>
96-
</orderEntry>
9788
<orderEntryProperties />
9889
</component>
9990
<component name="WebModuleBuildComponent">
@@ -106,7 +97,7 @@
10697
<setting name="RUN_JASPER_VALIDATION" value="false" />
10798
</component>
10899
<component name="WebModuleProperties">
109-
<containerElement type="module" name="springmodules">
100+
<containerElement type="module" name="core">
110101
<attribute name="method" value="1" />
111102
<attribute name="URI" value="/WEB-INF/classes" />
112103
</containerElement>
@@ -187,8 +178,8 @@
187178
</containerElement>
188179
<containerElement type="library" level="module">
189180
<attribute name="method" value="1" />
190-
<attribute name="URI" value="/WEB-INF/lib/dwr-0.4.jar" />
191-
<url>jar://$MODULE_DIR$/../../lib/dwr/dwr-0.4.jar!/</url>
181+
<attribute name="URI" value="/WEB-INF/lib/dwr-0.5.jar" />
182+
<url>jar://$MODULE_DIR$/../../lib/dwr/dwr-0.5.jar!/</url>
192183
</containerElement>
193184
<containerElement type="library" level="module">
194185
<attribute name="method" value="1" />

‎samples/osworkflow/src/java/org/springmodules/examples/workflow/osworkflow/web/EditDocumentForm.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ protected Object formBackingObject(HttpServletRequest httpServletRequest) throws
3939
protected ModelAndView onSubmit(Object command) throws Exception {
4040
Document document = (Document) command;
4141
this.workflow.uploadDocument(document);
42-
return new ModelAndView(new RedirectView("/approval/status"));
42+
return new ModelAndView(new RedirectView("../status"));
4343
}
4444

4545

‎samples/osworkflow/src/java/org/springmodules/examples/workflow/osworkflow/web/PassBackForm.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ public void setWorkflow(DocumentApprovalWorkflow workflow) {
2626

2727
protected ModelAndView onSubmit(Object command) throws Exception {
2828
this.workflow.passBack((Comment) command);
29-
return new ModelAndView(new RedirectView("/approval/status"));
29+
return new ModelAndView(new RedirectView("../status"));
3030
}
3131
}

‎samples/osworkflow/src/web/WEB-INF/applicationContext.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010
<property name="workflowName">
1111
<value>documentApproval</value>
1212
</property>
13-
<property name="contextManager">
14-
<ref local="workflowContextManager"/>
15-
</property>
1613
</bean>
1714

1815
<bean id="configuration" class="org.springmodules.workflow.osworkflow.configuration.ConfigurationBean">
@@ -24,7 +21,6 @@
2421
</property>
2522
</bean>
2623

27-
<bean id="workflowContextManager" class="org.springmodules.workflow.osworkflow.ThreadLocalWorkflowContextManager"/>
2824

2925
<bean id="workflow" class="org.springmodules.examples.workflow.osworkflow.service.OsWorkflowDocumentApprovalWorkflow">
3026
<property name="template">

‎samples/osworkflow/src/web/WEB-INF/jsp/approved.jsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
</tr>
1919
</table>
2020

21-
<a href="/index.jsp">Home</a> | <a href="underway">Underway</a> | <a href="logout">Logout</a>
21+
<a href="../index.jsp">Home</a> | <a href="../underway">Underway</a> | <a href="../logout">Logout</a>
2222
</body>
2323
</html>

‎samples/osworkflow/src/web/WEB-INF/jsp/status.jsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@
4747
</c:forEach>
4848

4949
<br>
50-
<a href="/index.jsp">Home</a> | <a href="underway">Underway</a> | <a href="logout">Logout</a>
50+
<a href="../index.jsp">Home</a> | <a href="underway">Underway</a> | <a href="logout">Logout</a>
5151
</body>
5252
</html>

‎samples/osworkflow/src/web/WEB-INF/osworkflow-servlet.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,7 @@
5757
<bean id="resolver" class="org.springframework.web.servlet.mvc.multiaction.InternalPathMethodNameResolver"/>
5858

5959
<bean id="contextInterceptor"
60-
class="org.springmodules.workflow.osworkflow.web.AcegiWorkflowContextHandlerInterceptor">
61-
<property name="contextManager">
62-
<ref bean="workflowContextManager"/>
63-
</property>
64-
</bean>
60+
class="org.springmodules.workflow.osworkflow.web.AcegiWorkflowContextHandlerInterceptor"/>
6561

6662

6763
</beans>

‎samples/osworkflow/src/web/error.jsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
<head><title>Login Error</title></head>
44
<body>
55
<h1>Login Error.</h1>
6-
<a href="/index.jsp">Home</a>
6+
<a href="index.jsp">Home</a>
77
</body>
88
</html>

‎samples/osworkflow/src/web/index.jsp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html>
33
<head><title>OSWorkflow Sample - Document Approval</title></head>
44
<body>
5-
<a href="/approval/start">Start New Document Approval Workflow</a><br>
6-
<a href="/approval/underway">Show Workflows in Progress</a><br>
5+
<a href="approval/start">Start New Document Approval Workflow</a><br>
6+
<a href="approval/underway">Show Workflows in Progress</a><br>
77
</body>
88
</html>

0 commit comments

Comments
 (0)