incubator-agila-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject svn commit: r329510 - in /incubator/agila/trunk/modules/bpm: ./ src/java/ src/main/ src/main/java/ src/main/java/org/apache/agila/impl/memory/ src/main/java/org/apache/agila/impl/servlet/ src/main/java/org/apache/agila/impl/web/ src/main/resources/ src...
Date Sun, 30 Oct 2005 02:09:22 GMT
Author: clim
Date: Sat Oct 29 19:08:52 2005
New Revision: 329510

URL: http://svn.apache.org/viewcvs?rev=329510&view=rev
Log:
Updated directory layout for Maven 2.

Added:
    incubator/agila/trunk/modules/bpm/pom.xml
    incubator/agila/trunk/modules/bpm/src/main/
    incubator/agila/trunk/modules/bpm/src/main/java/
      - copied from r329395, incubator/agila/trunk/modules/bpm/src/java/
    incubator/agila/trunk/modules/bpm/src/main/resources/
      - copied from r329395, incubator/agila/trunk/modules/bpm/src/resources/
    incubator/agila/trunk/modules/bpm/src/main/webapp/
      - copied from r329395, incubator/agila/trunk/modules/bpm/src/webapp/
    incubator/agila/trunk/modules/bpm/src/main/webapp/view/
    incubator/agila/trunk/modules/bpm/src/test/java/
    incubator/agila/trunk/modules/bpm/src/test/java/org/
      - copied from r329395, incubator/agila/trunk/modules/bpm/src/test/org/
    incubator/agila/trunk/modules/bpm/src/test/resources/
    incubator/agila/trunk/modules/bpm/src/test/resources/GroovyNodeWorkflow.xml
      - copied unchanged from r329395, incubator/agila/trunk/modules/bpm/src/test-resources/GroovyNodeWorkflow.xml
    incubator/agila/trunk/modules/bpm/src/test/resources/LeaveApplication.xml
      - copied unchanged from r329395, incubator/agila/trunk/modules/bpm/src/test-resources/LeaveApplication.xml
    incubator/agila/trunk/modules/bpm/src/test/resources/jdbc.properties
      - copied unchanged from r329395, incubator/agila/trunk/modules/bpm/src/test-resources/jdbc.properties
    incubator/agila/trunk/modules/bpm/src/test/resources/node/
      - copied from r329395, incubator/agila/trunk/modules/bpm/src/test-resources/node/
Removed:
    incubator/agila/trunk/modules/bpm/src/java/
    incubator/agila/trunk/modules/bpm/src/resources/
    incubator/agila/trunk/modules/bpm/src/test-resources/GroovyNodeWorkflow.xml
    incubator/agila/trunk/modules/bpm/src/test-resources/LeaveApplication.xml
    incubator/agila/trunk/modules/bpm/src/test-resources/jdbc.properties
    incubator/agila/trunk/modules/bpm/src/test-resources/node/
    incubator/agila/trunk/modules/bpm/src/test/org/
    incubator/agila/trunk/modules/bpm/src/webapp/
Modified:
    incubator/agila/trunk/modules/bpm/project.properties
    incubator/agila/trunk/modules/bpm/project.xml
    incubator/agila/trunk/modules/bpm/src/main/java/org/apache/agila/impl/memory/TaskServiceImpl.java
    incubator/agila/trunk/modules/bpm/src/main/java/org/apache/agila/impl/servlet/ActionServlet.java
    incubator/agila/trunk/modules/bpm/src/main/java/org/apache/agila/impl/web/AgilaServlet.java
    incubator/agila/trunk/modules/bpm/src/main/webapp/WEB-INF/web.xml

Added: incubator/agila/trunk/modules/bpm/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/agila/trunk/modules/bpm/pom.xml?rev=329510&view=auto
==============================================================================
--- incubator/agila/trunk/modules/bpm/pom.xml (added)
+++ incubator/agila/trunk/modules/bpm/pom.xml Sat Oct 29 19:08:52 2005
@@ -0,0 +1,126 @@
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.agila.bpm</groupId>
+    <artifactId>apache-agila</artifactId>
+    <packaging>war</packaging>
+    <name>Agila</name>
+    <version>1.0</version>
+
+    <url>http://incubator.apache.org/projects/agila/</url>
+    <issueManagement>
+        <system>jira</system>
+        <url>http://issues.apache.org/jira/browse/AGILA</url>
+    </issueManagement>
+    <inceptionYear>2004</inceptionYear>
+
+    <mailingLists>
+        <mailingList>
+            <name>Agila Dev List</name>
+            <subscribe>agila-dev-subscribe@incubator.apache.org</subscribe>
+            <unsubscribe>agila-dev-unsubscribe@incubator.apache.org</unsubscribe>
+            <archive>http://mail-archives.apache.org/mod_mbox/incubator-agila-dev/</archive>
+        </mailingList>
+        <mailingList>
+            <name>Agila User List</name>
+            <subscribe>agila-user-subscribe@incubator.apache.org</subscribe>
+            <unsubscribe>agila-user-unsubscribe@incubator.apache.org</unsubscribe>
+            <archive>http://mail-archives.apache.org/mod_mbox/incubator-agila-user//</archive>
+        </mailingList>
+    </mailingLists>
+
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <developers>
+        <developer>
+            <id>clim</id>
+            <name>Christopher Lim</name>
+            <email>clim@apache.org</email>
+            <organization>Maven</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+            <timezone>GMT+8</timezone>
+        </developer>
+
+    </developers>
+
+    <scm>
+        <connection>
+            scm:svn:http://svn.apache.org/repos/asf/incubator/agila/trunk/modules/bpm/</connection>
+        <developerConnection>
+            scm:svn:http://svn.apache.org/repos/asf/incubator/agila/trunk/modules/bpm/</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/incubator/agila/trunk/modules/bpm/</url>
+    </scm>
+
+    <organization>
+        <name>Apache</name>
+        <url>http://www.apache.org/</url>
+    </organization>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.4</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>velocity</groupId>
+            <artifactId>velocity-dep</artifactId>
+            <version>1.4</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+            <version>1.7.0</version>
+        </dependency>
+        <dependency>
+            <groupId>groovy</groupId>
+            <artifactId>groovy-all-1.0-jsr</artifactId>
+            <version>03</version>
+        </dependency>
+        <dependency>
+            <groupId>dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+            <version>1.4</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-jexl</groupId>
+            <artifactId>commons-jexl</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>concurrent</groupId>
+            <artifactId>concurrent</artifactId>
+            <version>1.3.4</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+            <version>1.8.0.1</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <defaultGoal>package</defaultGoal>
+        <finalName>apache-agila</finalName>
+    </build>
+</project>

Modified: incubator/agila/trunk/modules/bpm/project.properties
URL: http://svn.apache.org/viewcvs/incubator/agila/trunk/modules/bpm/project.properties?rev=329510&r1=329509&r2=329510&view=diff
==============================================================================
--- incubator/agila/trunk/modules/bpm/project.properties (original)
+++ incubator/agila/trunk/modules/bpm/project.properties Sat Oct 29 19:08:52 2005
@@ -9,3 +9,4 @@
 maven.repo.remote=\
 http://people.apache.org/~clim/maven,\
 http://www.ibiblio.org/maven
+

Modified: incubator/agila/trunk/modules/bpm/project.xml
URL: http://svn.apache.org/viewcvs/incubator/agila/trunk/modules/bpm/project.xml?rev=329510&r1=329509&r2=329510&view=diff
==============================================================================
--- incubator/agila/trunk/modules/bpm/project.xml (original)
+++ incubator/agila/trunk/modules/bpm/project.xml Sat Oct 29 19:08:52 2005
@@ -158,12 +158,12 @@
 
   <build>
         <nagEmailAddress>agila-dev@incubator.apache.org</nagEmailAddress>
-        <sourceDirectory>src/java</sourceDirectory>
-        <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+        <sourceDirectory>src/main/java</sourceDirectory>
+        <unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
 
         <resources>
             <resource>
-                <directory>${basedir}/src/java</directory>
+                <directory>${basedir}/src/main/java</directory>
                 <includes>
                     <include>**/*.properties</include>
                     <include>**/*.xml</include>
@@ -171,7 +171,7 @@
             </resource>
 
             <resource>
-                <directory>${basedir}/src/resources/jdbc</directory>
+                <directory>${basedir}/src/main/resources/jdbc</directory>
                 <includes>
                     <include>**/*.properties</include>
                     <include>**/*.xml</include>
@@ -179,7 +179,7 @@
             </resource>
 
             <resource>
-                <directory>${basedir}/src/resources</directory>
+                <directory>${basedir}/src/main/resources</directory>
                 <includes>
                     <include>**/*.xml</include>
                 </includes>
@@ -193,7 +193,7 @@
             </includes>
             <resources>
                 <resource>
-                    <directory>${basedir}/src/test-resources</directory>
+                    <directory>${basedir}/src/test/resources</directory>
                     <includes>
                         <include>**/*.properties</include>
                         <include>**/*.xml</include>

Modified: incubator/agila/trunk/modules/bpm/src/main/java/org/apache/agila/impl/memory/TaskServiceImpl.java
URL: http://svn.apache.org/viewcvs/incubator/agila/trunk/modules/bpm/src/main/java/org/apache/agila/impl/memory/TaskServiceImpl.java?rev=329510&r1=329395&r2=329510&view=diff
==============================================================================
--- incubator/agila/trunk/modules/bpm/src/main/java/org/apache/agila/impl/memory/TaskServiceImpl.java
(original)
+++ incubator/agila/trunk/modules/bpm/src/main/java/org/apache/agila/impl/memory/TaskServiceImpl.java
Sat Oct 29 19:08:52 2005
@@ -111,7 +111,7 @@
             }
 
             // Task should exist in the list in order for the update to work.
-            assert (index != -1);
+//            assert (index != -1);
 
             taskList.set( index, ti );
         } else { // Add mode

Modified: incubator/agila/trunk/modules/bpm/src/main/java/org/apache/agila/impl/servlet/ActionServlet.java
URL: http://svn.apache.org/viewcvs/incubator/agila/trunk/modules/bpm/src/main/java/org/apache/agila/impl/servlet/ActionServlet.java?rev=329510&r1=329395&r2=329510&view=diff
==============================================================================
--- incubator/agila/trunk/modules/bpm/src/main/java/org/apache/agila/impl/servlet/ActionServlet.java
(original)
+++ incubator/agila/trunk/modules/bpm/src/main/java/org/apache/agila/impl/servlet/ActionServlet.java
Sat Oct 29 19:08:52 2005
@@ -43,13 +43,19 @@
     public void service(HttpServletRequest req, HttpServletResponse res)
         throws ServletException, java.io.IOException
     {
+        System.out.println( "ActionServlet.service()" );
+
         String actionVerb = getActionVerb();
 
         String what = req.getParameter(actionVerb);
 
+        System.out.println( "what:" + what );
+
         if (what == null) {
             what = "defaultAction";
         }
+
+        System.out.println( "what:" + what );
 
         try {
           Method method = this.getClass().getMethod(what, args);

Modified: incubator/agila/trunk/modules/bpm/src/main/java/org/apache/agila/impl/web/AgilaServlet.java
URL: http://svn.apache.org/viewcvs/incubator/agila/trunk/modules/bpm/src/main/java/org/apache/agila/impl/web/AgilaServlet.java?rev=329510&r1=329395&r2=329510&view=diff
==============================================================================
--- incubator/agila/trunk/modules/bpm/src/main/java/org/apache/agila/impl/web/AgilaServlet.java
(original)
+++ incubator/agila/trunk/modules/bpm/src/main/java/org/apache/agila/impl/web/AgilaServlet.java
Sat Oct 29 19:08:52 2005
@@ -95,6 +95,8 @@
 
         super.init();
 
+        System.out.println( "AgilaServlet.init()" );
+
         this.tokenService = new TokenServiceImpl();
         this.eiSvc = new InstanceServiceImpl();
         this.graphManager = new BusinessProcessServiceImpl();
@@ -155,13 +157,17 @@
      */
     public void defaultAction( HttpServletRequest request, HttpServletResponse response )
throws ServletException, IOException {
 
+        System.out.println( "defaultAction()" );
+
         if( request.isUserInRole( "admin" ) ) {
 
+            System.out.println( "user in role admin" );
             show_process_list( request, response );
             return;
 
         } else if( request.isUserInRole( "user" ) ) {
 
+            System.out.println( "user in role user" );
             show_task_list(request, response);
             return;
         }
@@ -238,12 +244,17 @@
 
     public void show_task_list( HttpServletRequest request, HttpServletResponse response
) throws ServletException, IOException {
 
+        System.out.println( "show_task_list" );
+
         List taskList = null;
 
         try {
+            System.out.println( "before getTasksForUser" );
             taskList = taskService.getTasksForUser( new UserID( 1 ), Task.TASK_INCOMPLETE
);
+            System.out.println( "after getTasksForUser" );
         } catch( NullPointerException e ) {
             // Do nothing. task list is empty
+            System.out.println( "exception occurred:" + e.getMessage() );
         }
 
         request.setAttribute( "list", taskList );
@@ -529,14 +540,19 @@
      * @throws IOException
      */
     public void doRender( HttpServletRequest request, HttpServletResponse response ) throws
ServletException, IOException {
+
+        System.out.println( "doRender" );
+
         String pageToDisplay = "errorPage.jsp";
 
         if( request.isUserInRole( "admin" ) ) {
 
+            System.out.println( "/WEB-INF/view/adminmenu.jsp" );
             pageToDisplay = "/WEB-INF/view/adminmenu.jsp";
 
         } else if( request.isUserInRole( "user" ) ) {
 
+            System.out.println( "/WEB-INF/view/usermenu.jsp" );
             pageToDisplay = "/WEB-INF/view/usermenu.jsp";
 
         }

Modified: incubator/agila/trunk/modules/bpm/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/incubator/agila/trunk/modules/bpm/src/main/webapp/WEB-INF/web.xml?rev=329510&r1=329395&r2=329510&view=diff
==============================================================================
--- incubator/agila/trunk/modules/bpm/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/agila/trunk/modules/bpm/src/main/webapp/WEB-INF/web.xml Sat Oct 29 19:08:52
2005
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+    "http://java.sun.com/dtd/web-app_2_3.dtd">
 
 
 <!--



Mime
View raw message