Skip to content

Commit

Permalink
Updated build, polished OSWorkflow example and update changelog
Browse files Browse the repository at this point in the history
  • Loading branch information
robh committed May 22, 2005
1 parent 828dd69 commit 08bc7d8
Show file tree
Hide file tree
Showing 12 changed files with 53 additions and 38 deletions.
8 changes: 6 additions & 2 deletions build.xml
View file
Expand Up @@ -439,6 +439,7 @@
<delete file="${target.release.dir}/${release-with-dependencies.zip}"/>

<fileset id="main" dir=".">
<exclude name="**/CVS/**/*"/>
<include name="dist/*.jar"/>
<include name="dist/*.dtd"/>
<include name="dist/*.tld"/>
Expand All @@ -454,6 +455,7 @@
<exclude name="docs/reference/html/**"/>
<exclude name="docs/reference/pdf/images/**"/>
<include name="samples/hivemind/**"/>
<include name="samples/osworkflow/**"/>
<include name="src/**"/>
<include name="test/**"/>
<include name="*.bat"/>
Expand All @@ -470,17 +472,19 @@
<zipfileset refid="main" prefix="${release.path}"/>
<zipfileset dir="." prefix="${release.path}">
<include name="lib/*.txt"/>
<include name="lib/acegi/**"/>
<include name="lib/ant/**"/>
<include name="lib/antlr/**"/>
<include name="lib/aopalliance/**"/>
<include name="lib/cglib/**"/>
<include name="lib/drools/**"/>
<include name="lib/easymock/**"/>
<include name="lib/hivemind/**"/>
<include name="lib/jakarta-commons/**"/>
<include name="lib/j2ee/**"/>
<include name="lib/j2ee/**"/>
<include name="lib/jakarta-commons/**"/>
<include name="lib/janino/**"/>
<include name="lib/javassist/**"/>
<include name="lib/jcs/**"/>
<include name="lib/jsr94/**"/>
<include name="lib/junit/**"/>
<include name="lib/log4j/**"/>
Expand Down
26 changes: 25 additions & 1 deletion changelog.txt
View file
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions project.properties
View file
Expand Up @@ -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

Expand Down
29 changes: 10 additions & 19 deletions samples/osworkflow/osworkflow.iml
View file
Expand Up @@ -12,10 +12,11 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Tomcat 5.0.28" level="application_server_libraries" />
<orderEntry type="module" module-name="core" />
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../lib/opensymphony/osworkflow-2.7.0.jar!/" />
<root url="jar://$MODULE_DIR$/../../lib/aopalliance/aopalliance.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Expand All @@ -24,7 +25,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../lib/spring/spring.jar!/" />
<root url="jar://$MODULE_DIR$/../../lib/jakarta-commons/commons-logging.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Expand All @@ -33,7 +34,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../lib/aopalliance/aopalliance.jar!/" />
<root url="jar://$MODULE_DIR$/../../lib/cglib/cglib-nodep-2.1-dev.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Expand All @@ -42,7 +43,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../lib/opensymphony/propertyset-1.3-21Apr04.jar!/" />
<root url="jar://$MODULE_DIR$/../../lib/opensymphony/osworkflow-2.7.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Expand All @@ -60,7 +61,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../lib/cglib/cglib-nodep-2.1-dev.jar!/" />
<root url="jar://$MODULE_DIR$/../../lib/opensymphony/propertyset-1.3-21Apr04.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Expand All @@ -69,7 +70,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../lib/jakarta-commons/commons-logging.jar!/" />
<root url="jar://$MODULE_DIR$/../../lib/spring/spring.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Expand All @@ -84,16 +85,6 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module" module-name="springmodules" />
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../lib/jakarta-taglibs/standard.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntryProperties />
</component>
<component name="WebModuleBuildComponent">
Expand All @@ -106,7 +97,7 @@
<setting name="RUN_JASPER_VALIDATION" value="false" />
</component>
<component name="WebModuleProperties">
<containerElement type="module" name="springmodules">
<containerElement type="module" name="core">
<attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/classes" />
</containerElement>
Expand Down Expand Up @@ -187,8 +178,8 @@
</containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib/dwr-0.4.jar" />
<url>jar://$MODULE_DIR$/../../lib/dwr/dwr-0.4.jar!/</url>
<attribute name="URI" value="/WEB-INF/lib/dwr-0.5.jar" />
<url>jar://$MODULE_DIR$/../../lib/dwr/dwr-0.5.jar!/</url>
</containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="1" />
Expand Down
2 changes: 1 addition & 1 deletion ...orkflow/src/java/org/springmodules/examples/workflow/osworkflow/web/EditDocumentForm.java
View file
Expand Up @@ -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"));
}


Expand Down
2 changes: 1 addition & 1 deletion .../osworkflow/src/java/org/springmodules/examples/workflow/osworkflow/web/PassBackForm.java
View file
Expand Up @@ -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"));
}
}
4 changes: 0 additions & 4 deletions samples/osworkflow/src/web/WEB-INF/applicationContext.xml
View file
Expand Up @@ -10,9 +10,6 @@
<property name="workflowName">
<value>documentApproval</value>
</property>
<property name="contextManager">
<ref local="workflowContextManager"/>
</property>
</bean>

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

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

<bean id="workflow" class="org.springmodules.examples.workflow.osworkflow.service.OsWorkflowDocumentApprovalWorkflow">
<property name="template">
Expand Down
2 changes: 1 addition & 1 deletion samples/osworkflow/src/web/WEB-INF/jsp/approved.jsp
View file
Expand Up @@ -18,6 +18,6 @@
</tr>
</table>

<a href="/index.jsp">Home</a> | <a href="underway">Underway</a> | <a href="logout">Logout</a>
<a href="../index.jsp">Home</a> | <a href="../underway">Underway</a> | <a href="../logout">Logout</a>
</body>
</html>
2 changes: 1 addition & 1 deletion samples/osworkflow/src/web/WEB-INF/jsp/status.jsp
View file
Expand Up @@ -47,6 +47,6 @@
</c:forEach>

<br>
<a href="/index.jsp">Home</a> | <a href="underway">Underway</a> | <a href="logout">Logout</a>
<a href="../index.jsp">Home</a> | <a href="underway">Underway</a> | <a href="logout">Logout</a>
</body>
</html>
6 changes: 1 addition & 5 deletions samples/osworkflow/src/web/WEB-INF/osworkflow-servlet.xml
View file
Expand Up @@ -57,11 +57,7 @@
<bean id="resolver" class="org.springframework.web.servlet.mvc.multiaction.InternalPathMethodNameResolver"/>

<bean id="contextInterceptor"
class="org.springmodules.workflow.osworkflow.web.AcegiWorkflowContextHandlerInterceptor">
<property name="contextManager">
<ref bean="workflowContextManager"/>
</property>
</bean>
class="org.springmodules.workflow.osworkflow.web.AcegiWorkflowContextHandlerInterceptor"/>


</beans>
2 changes: 1 addition & 1 deletion samples/osworkflow/src/web/error.jsp
View file
Expand Up @@ -3,6 +3,6 @@
<head><title>Login Error</title></head>
<body>
<h1>Login Error.</h1>
<a href="/index.jsp">Home</a>
<a href="index.jsp">Home</a>
</body>
</html>
4 changes: 2 additions & 2 deletions samples/osworkflow/src/web/index.jsp
View file
Expand Up @@ -2,7 +2,7 @@
<html>
<head><title>OSWorkflow Sample - Document Approval</title></head>
<body>
<a href="/approval/start">Start New Document Approval Workflow</a><br>
<a href="/approval/underway">Show Workflows in Progress</a><br>
<a href="approval/start">Start New Document Approval Workflow</a><br>
<a href="approval/underway">Show Workflows in Progress</a><br>
</body>
</html>

0 comments on commit 08bc7d8

Please sign in to comment.