You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by tv...@apache.org on 2007/05/05 08:58:51 UTC

svn commit: r535465 [10/49] - in /jakarta/turbine/fulcrum/trunk: ./ bsf/ bsf/src/java/org/apache/fulcrum/bsf/ bsf/src/test/ bsf/xdocs/ cache/ cache/src/java/org/apache/fulcrum/cache/ cache/src/java/org/apache/fulcrum/cache/impl/ cache/src/test/ cache/s...

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/example/project.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/example/project.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/osworkflow/example/project.xml (original)
+++ jakarta/turbine/fulcrum/trunk/osworkflow/example/project.xml Fri May  4 23:58:06 2007
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
 <!-- -*- coding: mule-utf-8-unix; -*-  -->
 
 <project>
@@ -29,12 +47,12 @@
       <name>Youngho Cho</name>
       <id>ycho</id>
       <email>youngho@nannet.co.kr</email>
-    </contributor>  
+    </contributor>
     <contributor>
       <name>Tim Müller-Seydlitz</name>
       <id>tmuller</id>
       <email>tms@nagler-company.com</email>
-    </contributor> 
+    </contributor>
   </contributors>
 
   <dependencies>
@@ -43,137 +61,137 @@
       <artifactId>turbine</artifactId>
       <version>2.3.2</version>
       <url>http://jakarta.apache.org/turbine/</url>
-      <properties>        
+      <properties>
         <war.bundle>true</war.bundle>
-      </properties>      
-    </dependency>  
+      </properties>
+    </dependency>
     <dependency>
       <groupId>fulcrum</groupId>
       <artifactId>fulcrum-osworkflow</artifactId>
       <version>1.0.1</version>
       <url>http://jakarta.apache.org/turbine/fulcrum/osworkflow</url>
-      <properties>        
+      <properties>
         <war.bundle>true</war.bundle>
-      </properties>      
-    </dependency> 
+      </properties>
+    </dependency>
     <dependency>
       <groupId>opensymphony</groupId>
       <artifactId>osworkflow</artifactId>
       <version>2.7.0</version>
       <url>http://www.opensymphony.com/osworkflow</url>
-      <properties>        
+      <properties>
         <war.bundle>true</war.bundle>
-      </properties>      
-    </dependency>    
+      </properties>
+    </dependency>
     <dependency>
       <groupId>opensymphony</groupId>
       <artifactId>oscore</artifactId>
       <version>2.2.4</version>
       <url>http://www.opensymphony.com/</url>
-      <properties>        
+      <properties>
         <war.bundle>true</war.bundle>
-      </properties>      
-    </dependency>    
+      </properties>
+    </dependency>
     <dependency>
       <groupId>opensymphony</groupId>
       <artifactId>propertyset</artifactId>
       <version>1.3</version>
       <url>http://www.opensymphony.com/</url>
-      <properties>        
+      <properties>
         <war.bundle>true</war.bundle>
-      </properties>      
-    </dependency>  
+      </properties>
+    </dependency>
     <!--dependency>
       <groupId>opensymphony</groupId>
       <artifactId>osuser</artifactId>
       <version>1.0-dev</version>
       <url>http://www.opensymphony.com/</url>
-      <properties>        
+      <properties>
         <war.bundle>true</war.bundle>
-      </properties>            
-    </dependency-->    
+      </properties>
+    </dependency-->
 
     <dependency>
       <groupId>taglibs</groupId>
       <artifactId>taglibs-response</artifactId>
       <version>1.0.1</version>
       <url>http://jakarta.apache.org/taglibs/</url>
-      <properties>        
+      <properties>
         <war.bundle>true</war.bundle>
-      </properties>            
-    </dependency> 
-    
+      </properties>
+    </dependency>
+
     <dependency>
       <groupId>bsh</groupId>
       <artifactId>bsh</artifactId>
       <version>1.2b7</version>
-      <properties>        
+      <properties>
         <war.bundle>true</war.bundle>
-      </properties>      
-    </dependency> 
+      </properties>
+    </dependency>
     <dependency>
       <groupId>bsf</groupId>
       <artifactId>bsf</artifactId>
       <version>2.3.0</version>
-      <properties>        
+      <properties>
         <war.bundle>true</war.bundle>
-      </properties>      
-    </dependency>            
-    
-    
+      </properties>
+    </dependency>
+
+
     <!-- Boilerplate Turbine Dependency List -->
     <dependency>
       <groupId>commons-beanutils</groupId>
       <artifactId>commons-beanutils</artifactId>
       <version>1.6.1</version>
       <url>http://jakarta.apache.org/commons/beanutils.html</url>
-      <properties>        
+      <properties>
         <war.bundle>true</war.bundle>
-      </properties>      
+      </properties>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
       <version>1.3</version>
-      <properties>        
+      <properties>
         <war.bundle>true</war.bundle>
-      </properties>      
+      </properties>
     </dependency>
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
       <version>3.1</version>
       <url>http://jakarta.apache.org/commons/collections.html</url>
-      <properties>        
+      <properties>
         <war.bundle>true</war.bundle>
-      </properties>      
+      </properties>
     </dependency>
     <dependency>
       <groupId>commons-configuration</groupId>
       <artifactId>commons-configuration</artifactId>
       <version>1.2</version>
       <url>http://jakarta.apache.org/commons/sandbox/configuration/index.html</url>
-      <properties>        
+      <properties>
         <war.bundle>true</war.bundle>
-      </properties>      
+      </properties>
     </dependency>
     <dependency>
       <groupId>commons-digester</groupId>
       <artifactId>commons-digester</artifactId>
       <version>1.5</version>
       <url>http://jakarta.apache.org/commons/digester/index.html</url>
-      <properties>        
+      <properties>
         <war.bundle>true</war.bundle>
-      </properties>      
+      </properties>
     </dependency>
     <dependency>
         <groupId>commons-email</groupId>
         <artifactId>commons-email</artifactId>
         <version>1.0</version>
         <url>http://jakarta.apache.org/commons/email.html</url>
-      <properties>        
+      <properties>
         <war.bundle>true</war.bundle>
-      </properties>      
+      </properties>
     </dependency>
 
     <dependency>
@@ -181,91 +199,91 @@
       <artifactId>commons-fileupload</artifactId>
       <version>1.1</version>
       <url>http://jakarta.apache.org/commons/fileupload/index.html</url>
-      <properties>        
+      <properties>
         <war.bundle>true</war.bundle>
-      </properties>      
+      </properties>
     </dependency>
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
       <version>2.1</version>
       <url>http://jakarta.apache.org/commons/lang.html</url>
-      <properties>        
+      <properties>
         <war.bundle>true</war.bundle>
-      </properties>      
+      </properties>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
       <version>1.0.4</version>
       <url>http://jakarta.apache.org/commons/logging.html</url>
-      <properties>        
+      <properties>
         <war.bundle>true</war.bundle>
-      </properties>      
+      </properties>
     </dependency>
     <dependency>
       <groupId>commons-pool</groupId>
       <artifactId>commons-pool</artifactId>
       <version>1.3</version>
       <url>http://jakarta.apache.org/commons/pool/</url>
-      <properties>        
+      <properties>
         <war.bundle>true</war.bundle>
-      </properties>      
+      </properties>
     </dependency>
-   
+
     <dependency>
       <groupId>dom4j</groupId>
       <artifactId>dom4j</artifactId>
       <version>1.6.1</version>
       <url>http://www.dom4j.org/</url>
-      <properties>        
+      <properties>
         <war.bundle>true</war.bundle>
-      </properties>      
+      </properties>
     </dependency>
     <dependency>
       <groupId>ecs</groupId>
       <artifactId>ecs</artifactId>
       <version>1.4.2</version>
       <url>http://jakarta.apache.org/ecs/</url>
-      <properties>        
+      <properties>
         <war.bundle>true</war.bundle>
-      </properties>      
+      </properties>
     </dependency>
     <dependency>
       <groupId>excalibur-component</groupId>
       <artifactId>excalibur-component</artifactId>
       <version>2.1</version>
       <url>http://excalibur.apache.org/</url>
-      <properties>        
+      <properties>
         <war.bundle>true</war.bundle>
-      </properties>      
+      </properties>
     </dependency>
     <dependency>
       <groupId>excalibur-instrument</groupId>
       <artifactId>excalibur-instrument-api</artifactId>
       <version>2.1</version>
       <url>http://excalibur.apache.org/</url>
-      <properties>        
+      <properties>
         <war.bundle>true</war.bundle>
-      </properties>      
+      </properties>
     </dependency>
     <dependency>
       <groupId>excalibur-logger</groupId>
       <artifactId>excalibur-logger</artifactId>
       <version>2.1</version>
       <url>http://excalibur.apache.org/</url>
-      <properties>        
+      <properties>
         <war.bundle>true</war.bundle>
-      </properties>      
+      </properties>
     </dependency>
     <dependency>
       <groupId>excalibur-pool</groupId>
       <artifactId>excalibur-pool-api</artifactId>
       <version>2.1</version>
       <url>http://excalibur.apache.org/</url>
-      <properties>        
+      <properties>
         <war.bundle>true</war.bundle>
-      </properties>      
+      </properties>
     </dependency>
     <dependency>
       <groupId>fulcrum</groupId>
@@ -275,63 +293,63 @@
       <properties>
         <war.bundle>true</war.bundle>
       </properties>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>javax.activation</groupId>
       <artifactId>activation</artifactId>
       <version>1.0.2</version>
       <url>http://java.sun.com/products/javabeans/glasgow/jaf.html</url>
-      <properties>        
+      <properties>
         <war.bundle>true</war.bundle>
-      </properties>      
+      </properties>
     </dependency>
     <dependency>
       <groupId>javax.mail</groupId>
       <artifactId>mail</artifactId>
       <version>1.3.3</version>
       <url>http://java.sun.com/products/javamail/</url>
-      <properties>        
+      <properties>
         <war.bundle>true</war.bundle>
-      </properties>      
+      </properties>
     </dependency>
-<!--  Maybe not needed?    
+<!--  Maybe not needed?
     <dependency>
       <groupId>jdbc</groupId>
       <artifactId>jdbc</artifactId>
       <version>2.0</version>
       <url>http://java.sun.com/products/jdbc/</url>
-      <properties>        
+      <properties>
         <war.bundle>true</war.bundle>
-      </properties>      
+      </properties>
     </dependency>
     <dependency>
       <groupId>jndi</groupId>
       <artifactId>jndi</artifactId>
       <version>1.2.1</version>
       <url>http://java.sun.com/products/jndi/</url>
-      <properties>        
+      <properties>
         <war.bundle>true</war.bundle>
-      </properties>      
+      </properties>
     </dependency>
 -->
-  
+
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
       <version>1.2.8</version>
       <url>http://jakarta.apache.org/log4j/</url>
-      <properties>        
+      <properties>
         <war.bundle>true</war.bundle>
-      </properties>      
+      </properties>
     </dependency>
     <dependency>
       <groupId>avalon-logkit</groupId>
       <artifactId>avalon-logkit</artifactId>
       <version>2.1</version>
       <url>http://excalibur.apache.org/</url>
-      <properties>        
+      <properties>
         <war.bundle>true</war.bundle>
-      </properties>      
+      </properties>
     </dependency>
     <dependency>
       <groupId>servletapi</groupId>
@@ -344,63 +362,63 @@
       <artifactId>stratum</artifactId>
       <version>1.0</version>
       <url>http://jakarta.apache.org/turbine/stratum/</url>
-      <properties>        
+      <properties>
         <war.bundle>true</war.bundle>
-      </properties>      
+      </properties>
     </dependency>
     <dependency>
       <groupId>torque</groupId>
       <artifactId>torque</artifactId>
       <version>3.2</version>
       <url>http://db.apache.org/torque/</url>
-      <properties>        
+      <properties>
         <war.bundle>true</war.bundle>
-      </properties>      
+      </properties>
     </dependency>
     <dependency>
       <groupId>velocity</groupId>
       <artifactId>velocity</artifactId>
       <version>1.4</version>
       <url>http://jakarta.apache.org/velocity/</url>
-      <properties>        
+      <properties>
         <war.bundle>true</war.bundle>
-      </properties>      
+      </properties>
     </dependency>
     <dependency>
       <groupId>village</groupId>
       <artifactId>village</artifactId>
       <version>2.0</version>
       <url>http://share.whichever.com/index.php?SCREEN=village</url>
-      <properties>        
+      <properties>
         <war.bundle>true</war.bundle>
-      </properties>      
+      </properties>
     </dependency>
     <dependency>
       <groupId>xalan</groupId>
       <artifactId>xalan</artifactId>
       <version>2.5.1</version>
-      <url>http://xml.apache.org/xalan-j/</url>        
-      <properties>        
+      <url>http://xml.apache.org/xalan-j/</url>
+      <properties>
         <war.bundle>true</war.bundle>
       </properties>
     </dependency>
     <dependency>
-      <groupId>xerces</groupId>      
-      <artifactId>xerces</artifactId>      
+      <groupId>xerces</groupId>
+      <artifactId>xerces</artifactId>
       <version>2.3.0</version>
-      <properties>        
+      <properties>
         <war.bundle>true</war.bundle>
       </properties>
-    </dependency>    
+    </dependency>
     <dependency>
-      <groupId>xml-apis</groupId>      
-      <artifactId>xml-apis</artifactId>      
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
       <version>2.0.2</version>
-      <properties>        
+      <properties>
         <war.bundle>true</war.bundle>
       </properties>
-    </dependency>      
-   
+    </dependency>
+
   </dependencies>
 
   <build>
@@ -417,25 +435,25 @@
   </build>
 
   <reports>
-    
+
       <report>maven-jdepend-plugin</report>
       <report>maven-changelog-plugin</report>
       <report>maven-changes-plugin</report>
       <report>maven-developer-activity-plugin</report>
       <report>maven-file-activity-plugin</report>
       <report>maven-javadoc-plugin</report>
-      <report>maven-jxr-plugin</report>    
+      <report>maven-jxr-plugin</report>
       <report>maven-junit-report-plugin</report>
       <report>maven-pmd-plugin</report>
-      
+
    <!--  maven site-all chokes on these.
       <report>maven-linkcheck-plugin</report>
-      <report>maven-checkstyle-plugin</report> 
+      <report>maven-checkstyle-plugin</report>
       <report>maven-tasklist-plugin</report>
       -->
-      
-  
-  
+
+
+
   </reports>
 
 </project>

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/example/src/java/org/apache/fulcrum/osworkflow/example/modules/actions/Index.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/example/src/java/org/apache/fulcrum/osworkflow/example/modules/actions/Index.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/osworkflow/example/src/java/org/apache/fulcrum/osworkflow/example/modules/actions/Index.java (original)
+++ jakarta/turbine/fulcrum/trunk/osworkflow/example/src/java/org/apache/fulcrum/osworkflow/example/modules/actions/Index.java Fri May  4 23:58:06 2007
@@ -2,19 +2,22 @@
 
 
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/example/src/java/org/apache/fulcrum/osworkflow/example/modules/actions/WorkflowAction.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/example/src/java/org/apache/fulcrum/osworkflow/example/modules/actions/WorkflowAction.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/osworkflow/example/src/java/org/apache/fulcrum/osworkflow/example/modules/actions/WorkflowAction.java (original)
+++ jakarta/turbine/fulcrum/trunk/osworkflow/example/src/java/org/apache/fulcrum/osworkflow/example/modules/actions/WorkflowAction.java Fri May  4 23:58:06 2007
@@ -2,19 +2,22 @@
 
 
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 
@@ -163,7 +166,7 @@
             data.getMessages().setMessage("", "ERROR", e.getMessage());
         }
     }
-  
+
     /**
     *  Perform an action for a workflow that moves it from one state
     * to the next.

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/example/src/java/org/apache/fulcrum/osworkflow/example/modules/actions/package.html
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/example/src/java/org/apache/fulcrum/osworkflow/example/modules/actions/package.html?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/osworkflow/example/src/java/org/apache/fulcrum/osworkflow/example/modules/actions/package.html (original)
+++ jakarta/turbine/fulcrum/trunk/osworkflow/example/src/java/org/apache/fulcrum/osworkflow/example/modules/actions/package.html Fri May  4 23:58:06 2007
@@ -1,3 +1,21 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
 <html>
 <head>
 <!-- head part is ignored -->

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/example/src/java/org/apache/fulcrum/osworkflow/example/tools/WorkflowTool.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/example/src/java/org/apache/fulcrum/osworkflow/example/tools/WorkflowTool.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/osworkflow/example/src/java/org/apache/fulcrum/osworkflow/example/tools/WorkflowTool.java (original)
+++ jakarta/turbine/fulcrum/trunk/osworkflow/example/src/java/org/apache/fulcrum/osworkflow/example/tools/WorkflowTool.java Fri May  4 23:58:06 2007
@@ -2,19 +2,22 @@
 
 
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 
@@ -48,7 +51,7 @@
     /** Turbine User object */
     private User user;
 
-  
+
     /**
      * Creates a new instance.  Used by <code>PullService</code>.
      */

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/example/src/java/org/apache/fulcrum/osworkflow/example/tools/package.html
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/example/src/java/org/apache/fulcrum/osworkflow/example/tools/package.html?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/osworkflow/example/src/java/org/apache/fulcrum/osworkflow/example/tools/package.html (original)
+++ jakarta/turbine/fulcrum/trunk/osworkflow/example/src/java/org/apache/fulcrum/osworkflow/example/tools/package.html Fri May  4 23:58:06 2007
@@ -1,3 +1,21 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
 <html>
 <head>
 <!-- head part is ignored -->

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/WEB-INF/classes/example.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/WEB-INF/classes/example.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/WEB-INF/classes/example.xml (original)
+++ jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/WEB-INF/classes/example.xml Fri May  4 23:58:06 2007
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
 <!DOCTYPE workflow PUBLIC "-//OpenSymphony Group//DTD OSWorkflow 2.5//EN" "http://www.opensymphony.com/osworkflow/workflow_2_5.dtd">
 <workflow>
 	<initial-actions>

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/WEB-INF/classes/osworkflow.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/WEB-INF/classes/osworkflow.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/WEB-INF/classes/osworkflow.xml (original)
+++ jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/WEB-INF/classes/osworkflow.xml Fri May  4 23:58:06 2007
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
 <osworkflow>
     <persistence class="com.opensymphony.workflow.spi.memory.MemoryWorkflowStore"/>
 

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/WEB-INF/classes/workflows.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/WEB-INF/classes/workflows.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/WEB-INF/classes/workflows.xml (original)
+++ jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/WEB-INF/classes/workflows.xml Fri May  4 23:58:06 2007
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
 <workflows>
     <workflow name="example" type="resource" location="example.xml"/>
 </workflows>

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/WEB-INF/conf/TurbineResources.properties
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/WEB-INF/conf/TurbineResources.properties?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/WEB-INF/conf/TurbineResources.properties (original)
+++ jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/WEB-INF/conf/TurbineResources.properties Fri May  4 23:58:06 2007
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # -------------------------------------------------------------------
 # $Id$
 #
@@ -61,7 +77,7 @@
 navigation.cache.size=10
 page.cache.size=5
 screen.cache.size=50
-#scheduledjob.cache.size=10
+# scheduledjob.cache.size=10
 
 # -------------------------------------------------------------------
 #
@@ -292,16 +308,16 @@
 services.LocalizationService.classname=org.apache.turbine.services.localization.TurbineLocalizationService
 services.MimeTypeService.classname=org.apache.turbine.services.mimetype.TurbineMimeTypeService
 services.GlobalCacheService.classname=org.apache.turbine.services.cache.TurbineGlobalCacheService
-#services.SchedulerService.classname=org.apache.turbine.services.schedule.TurbineSchedulerService
-#services.XmlRpcService.classname=org.apache.turbine.services.xmlrpc.TurbineXmlRpcService
+# services.SchedulerService.classname=org.apache.turbine.services.schedule.TurbineSchedulerService
+# services.XmlRpcService.classname=org.apache.turbine.services.xmlrpc.TurbineXmlRpcService
 services.UniqueIdService.classname=org.apache.turbine.services.uniqueid.TurbineUniqueIdService
 services.UploadService.classname=org.apache.turbine.services.upload.TurbineUploadService
 services.SecurityService.classname=org.apache.turbine.services.security.db.DBSecurityService
 services.PullService.classname=org.apache.turbine.services.pull.TurbinePullService
-#services.IntakeService.classname=org.apache.turbine.services.intake.TurbineIntakeService
+# services.IntakeService.classname=org.apache.turbine.services.intake.TurbineIntakeService
 services.TemplateService.classname=org.apache.turbine.services.template.TurbineTemplateService
-#services.XSLTService.classname=org.apache.turbine.services.xslt.TurbineXSLTService
-#services.SessionService.classname=org.apache.turbine.services.session.TurbineSessionService
+# services.XSLTService.classname=org.apache.turbine.services.xslt.TurbineXSLTService
+# services.SessionService.classname=org.apache.turbine.services.session.TurbineSessionService
 
 # Turn on the appropriate template service.
 services.VelocityService.classname=org.apache.turbine.services.velocity.TurbineVelocityService
@@ -353,12 +369,12 @@
 # -------------------------------------------------------------------
 
 services.AssemblerBrokerService.screen=org.apache.turbine.services.assemblerbroker.util.java.JavaScreenFactory
-#services.AssemblerBrokerService.screen=org.apache.turbine.services.assemblerbroker.util.python.PythonScreenFactory
+# services.AssemblerBrokerService.screen=org.apache.turbine.services.assemblerbroker.util.python.PythonScreenFactory
 services.AssemblerBrokerService.action=org.apache.turbine.services.assemblerbroker.util.java.JavaActionFactory
 services.AssemblerBrokerService.layout=org.apache.turbine.services.assemblerbroker.util.java.JavaLayoutFactory
 services.AssemblerBrokerService.page=org.apache.turbine.services.assemblerbroker.util.java.JavaPageFactory
 services.AssemblerBrokerService.navigation=org.apache.turbine.services.assemblerbroker.util.java.JavaNavigationFactory
-#services.AssemblerBrokerService.scheduledjob=org.apache.turbine.services.assemblerbroker.util.java.JavaScheduledJobFactory
+# services.AssemblerBrokerService.scheduledjob=org.apache.turbine.services.assemblerbroker.util.java.JavaScheduledJobFactory
 
 # -------------------------------------------------------------------
 #
@@ -476,7 +492,7 @@
 services.VelocityService.default.layout.template = /Default.vm
 
 services.VelocityService.runtime.log=/logs/velocity.log
-#services.VelocityService.input.encoding=UTF-8
+# services.VelocityService.input.encoding=UTF-8
 services.VelocityService.velocimacro.library = GlobalMacros.vm
 
 services.VelocityService.resource.loader = file
@@ -492,7 +508,7 @@
 # added by eric
 services.VelocityService.velocimacro.library.autoreload=true
 services.VelocityService.velocimacro.permissions.allow.inline = true
-services.VelocityService.velocimacro.permissions.allow.inline.to.replace.global = true 
+services.VelocityService.velocimacro.permissions.allow.inline.to.replace.global = true
 
 
 # -------------------------------------------------------------------
@@ -572,7 +588,7 @@
 # the Apache Server, i.e.
 # <mimetype> <ext1> <ext2>...
 #
-#services.MimeTypeService.mime.types=/WEB-INF/conf/mime.types
+# services.MimeTypeService.mime.types=/WEB-INF/conf/mime.types
 
 # This property specifies a file containing mappings between locales
 # and the corresponding character encodings. The service itself
@@ -580,7 +596,7 @@
 # The file should use the Java property file syntax, i.e.
 # <lang_country_variant>=<charset>
 #
-#services.MimeTypeService.charsets=/WEB-INF/conf/charset.properties
+# services.MimeTypeService.charsets=/WEB-INF/conf/charset.properties
 
 # -------------------------------------------------------------------
 #
@@ -597,12 +613,12 @@
 # Default = false
 #
 
-#services.SchedulerService.enabled=false
+# services.SchedulerService.enabled=false
 
 # Determines if the scheduler service should be initialized early.  This
 # Should always be set to true!!!!
 
-#services.SchedulerService.earlyInit=true
+# services.SchedulerService.earlyInit=true
 
 # -------------------------------------------------------------------
 #
@@ -737,7 +753,7 @@
 #
 # Default: 127.0.0.1
 
-#services.XmlRpcService.address=127.0.0.1
+# services.XmlRpcService.address=127.0.0.1
 
 # This property specifies which TCP port the web server part of
 # XmlRpc should listen on (if it is active).
@@ -760,8 +776,8 @@
 #
 # Default: no classes are specified by default
 
-#services.XmlRpcService.handler.$default=java.util.Hashtable
-#services.XmlRpcService.handler.stringhandler=java.lang.String
+# services.XmlRpcService.handler.$default=java.util.Hashtable
+# services.XmlRpcService.handler.stringhandler=java.lang.String
 
 # The following properties allow the transfer of data between
 # separate Turbine applications running on different servers.
@@ -820,7 +836,7 @@
 
 # Class specific capacities used instead of the default if specified.
 #
-#services.PoolService.pool.capacity.org.apache.turbine.services.rundata.DefaultTurbineRunData=512
+# services.PoolService.pool.capacity.org.apache.turbine.services.rundata.DefaultTurbineRunData=512
 
 # -------------------------------------------------------------------
 #
@@ -832,7 +848,7 @@
 #
 # Example: org.foo.bar.MyClassLoader, org.ack.joe.YourClassLoader
 #
-#services.FactoryService.class.loaders=
+# services.FactoryService.class.loaders=
 
 # Customized factories to be used instead of the default factory.
 # E.g. to instantiate XML parsers, SSL sockets, etc., which require
@@ -848,11 +864,11 @@
 # services.FactoryService.factory.javax.xml.parsers.SAXParser=org.foo.xml.SaxParserFactory
 # services.FactoryService.factory.java.net.ServerSocket=org.foo.net.SslServerSocketFactory
 
-#--------------------------------------------------------------------
+# --------------------------------------------------------------------
 #
 # X S L T  S E R V I C E
 #
-#--------------------------------------------------------------------
+# --------------------------------------------------------------------
 
 services.XSLTService.path = /path/to/stylesheets
 services.XSLTService.cache = false
@@ -882,11 +898,11 @@
 #
 services.IntakeService.serialize.path=WEB-INF/appData.ser
 
-#--------------------------------------------------------------------
+# --------------------------------------------------------------------
 #
 # P A R A M E T E R  P A R S E R
 #
-#--------------------------------------------------------------------
+# --------------------------------------------------------------------
 #
 # This variable controls the case folding applied to URL variable
 # names.

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/WEB-INF/conf/componentConfiguration.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/WEB-INF/conf/componentConfiguration.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/WEB-INF/conf/componentConfiguration.xml (original)
+++ jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/WEB-INF/conf/componentConfiguration.xml Fri May  4 23:58:06 2007
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
 
 <my-system>
   <component

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/WEB-INF/conf/componentRoles.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/WEB-INF/conf/componentRoles.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/WEB-INF/conf/componentRoles.xml (original)
+++ jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/WEB-INF/conf/componentRoles.xml Fri May  4 23:58:06 2007
@@ -1,6 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
 <role-list>
  <role
     name="org.apache.fulcrum.osworkflow.WorkflowService"
     shorthand="workflow"
-    default-class="org.apache.fulcrum.osworkflow.DefaultWorkflowService"/>   
-</role-list>
\ No newline at end of file
+    default-class="org.apache.fulcrum.osworkflow.DefaultWorkflowService"/>
+</role-list>

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/WEB-INF/conf/log4j.properties
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/WEB-INF/conf/log4j.properties?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/WEB-INF/conf/log4j.properties (original)
+++ jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/WEB-INF/conf/log4j.properties Fri May  4 23:58:06 2007
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # ------------------------------------------------------------------------
 #
 # Logging Configuration for the Template Service tests.

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/WEB-INF/conf/tlds/response.tld
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/WEB-INF/conf/tlds/response.tld?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
Binary files - no diff available.

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/WEB-INF/web.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/WEB-INF/web.xml (original)
+++ jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/WEB-INF/web.xml Fri May  4 23:58:06 2007
@@ -1,7 +1,25 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
 <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
 <web-app>
-	
+
 	<servlet>
 		<servlet-name>fulcrum-osworkflow-example</servlet-name>
 		<servlet-class>org.apache.turbine.Turbine</servlet-class>

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/index.jsp
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/index.jsp?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
Binary files - no diff available.

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/style/ns4_only.css
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/style/ns4_only.css?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
Binary files - no diff available.

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/style/print.css
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/style/print.css?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
Binary files - no diff available.

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/style/scarab.css
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/style/scarab.css?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
Binary files - no diff available.

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/style/tigris.css
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/style/tigris.css?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
Binary files - no diff available.

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/style/tigris_transitional.dtd
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/style/tigris_transitional.dtd?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
Binary files - no diff available.

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/templates/app/GlobalMacros.vm
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/templates/app/GlobalMacros.vm?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
Binary files - no diff available.

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/templates/app/layouts/Default.vm
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/templates/app/layouts/Default.vm?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
Binary files - no diff available.

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/templates/app/navigations/DefaultBottom.vm
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/templates/app/navigations/DefaultBottom.vm?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
Binary files - no diff available.

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/templates/app/navigations/DefaultTop.vm
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/templates/app/navigations/DefaultTop.vm?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
Binary files - no diff available.

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/templates/app/navigations/Menu.vm
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/templates/app/navigations/Menu.vm?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
Binary files - no diff available.

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/templates/app/navigations/Messages.vm
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/templates/app/navigations/Messages.vm?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
Binary files - no diff available.

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/templates/app/screens/Index.vm
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/templates/app/screens/Index.vm?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
Binary files - no diff available.

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/templates/app/screens/WorkflowDetail.vm
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/example/src/webapp/templates/app/screens/WorkflowDetail.vm?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
Binary files - no diff available.

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/example/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/example/xdocs/changes.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/osworkflow/example/xdocs/changes.xml (original)
+++ jakarta/turbine/fulcrum/trunk/osworkflow/example/xdocs/changes.xml Fri May  4 23:58:06 2007
@@ -1,4 +1,22 @@
 <?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
 <document>
   <properties>
     <title>Fulcrum OSWorkflow Example App</title>
@@ -9,21 +27,21 @@
     <release version="1.0.1" date="2004-11-24">
       <action dev="ycho" type="add">
         Tweak documentation with more details on building.  Fix link to CVS.
-      </action> 
+      </action>
    	  <action dev="ycho" type="add">
         Integrated use of WorkflowServiceFacade
-      </action>     
+      </action>
       <action dev="epugh" type="add">
         Added extra helper methods to WorkflowTool provided by Youngho Cho.
-      </action>     
+      </action>
       <action dev="epugh" type="update">
         Changed project name and package structure to be fulcrum-osworkflow-example from the old
         fulcrum-workflow-example.  Better reflects the use of OSWorkflow engine.
-      </action>         
+      </action>
       <action dev="epugh" type="fix">
         Fixed bug with multiple users trying to access the system.  Broke the setup
         process into two steps, setup and login.  Thanks to Tom Herrick.
-      </action>     
+      </action>
       <action dev="epugh" type="add">
         Initial work on the Example Application
       </action>

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/example/xdocs/index.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/example/xdocs/index.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/osworkflow/example/xdocs/index.xml (original)
+++ jakarta/turbine/fulcrum/trunk/osworkflow/example/xdocs/index.xml Fri May  4 23:58:06 2007
@@ -1,4 +1,22 @@
 <?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
 
 <document>
 
@@ -11,20 +29,20 @@
 
   <section name="Overview">
     <p>
-      This is a small example application using the Turbine framework with the Fulcrum Workflow component. 
+      This is a small example application using the Turbine framework with the Fulcrum Workflow component.
     </p>
-  
+
     <p>
       It provides a similar demonstration using the Turbine framework to the example application included in
-      the OpenSymphony OSWorkflow distriubution.  This includes demostrating running BeanShell and BSF scripts, 
+      the OpenSymphony OSWorkflow distriubution.  This includes demostrating running BeanShell and BSF scripts,
       user authenctication etc..
     </p>
     <p>
-      It leverages the Turbine user by storing the user information in runData.getUser() object.  The persistence 
+      It leverages the Turbine user by storing the user information in runData.getUser() object.  The persistence
       mechanism is in memory, but it is very easy to swap in the JDBC persistence engine for OSWorkflow and use the
       same demo.
     </p>
-    
+
     <p>
       In this distribution is a little workflow pull tool that is used in the .vm templates as $workflow that allows
       easy access to some commonly used functions of the workflow service.
@@ -33,12 +51,12 @@
     <a href="screen1.png" target="_OUT">Workflows Screen</a><br/>
     <a href="screen2.png" target="_OUT">Workflow Detail Screen</a>
     </p>
-    
+
     <p>
       Feedback is warmly appreciated!
     </p>
   </section>
-  
+
   <section name="Build and Deploy Example">
   <p>
     To run this example, first check the source code out from CVS.  The .war file is not online as it is 10 megabytes, and Maven will

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/example/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/example/xdocs/navigation.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/osworkflow/example/xdocs/navigation.xml (original)
+++ jakarta/turbine/fulcrum/trunk/osworkflow/example/xdocs/navigation.xml Fri May  4 23:58:06 2007
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
 <project
   name="Workflow"
   href="http://jakarta.apache.org/turbine/fulcrum/workflow/">
@@ -10,13 +28,13 @@
       <item name="Fulcrum"
             href="http://jakarta.apache.org/turbine/fulcrum/"/>
       <item name="Fulcrum Workflow"
-            href="http://jakarta.apache.org/turbine/fulcrum/fulcrum-osworkflow/"/>            
+            href="http://jakarta.apache.org/turbine/fulcrum/fulcrum-osworkflow/"/>
       <item name="OSWorkflow"
-            href="http://www.opensymphony.com/osworkflow/"/>            
+            href="http://www.opensymphony.com/osworkflow/"/>
     </links>
 
     <menu name="Overview">
       <item name="Main"                 href="/index.html"/>
     </menu>
   </body>
-</project>
\ No newline at end of file
+</project>

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/project.properties
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/project.properties?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/osworkflow/project.properties (original)
+++ jakarta/turbine/fulcrum/trunk/osworkflow/project.properties Fri May  4 23:58:06 2007
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 maven.repo.remote=http://www.ibiblio.org/maven/,http://jakarta.apache.org/turbine/repo
 
 maven.checkstyle.format = turbine
@@ -9,4 +25,4 @@
 
 maven.multiproject.type=jar
 
-maven.javadoc.links=http://www.opensymphony.com/osworkflow/api/
\ No newline at end of file
+maven.javadoc.links=http://www.opensymphony.com/osworkflow/api/

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/project.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/project.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/osworkflow/project.xml (original)
+++ jakarta/turbine/fulcrum/trunk/osworkflow/project.xml Fri May  4 23:58:06 2007
@@ -1,4 +1,22 @@
 <?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
 <project>
   <extend>${basedir}/../project.xml</extend>
   <id>fulcrum-osworkflow</id>
@@ -18,38 +36,38 @@
       <email>youngho@nannet.co.kr</email>
     </contributor>
   </contributors>
-  
+
   <dependencies>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
       <version>1.0.4</version>
-    </dependency>   
+    </dependency>
     <dependency>
       <groupId>opensymphony</groupId>
       <artifactId>osworkflow</artifactId>
       <version>2.7.0</version>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>opensymphony</groupId>
       <artifactId>oscore</artifactId>
       <version>2.2.4</version>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>opensymphony</groupId>
       <artifactId>propertyset</artifactId>
       <version>1.3</version>
-    </dependency>  
+    </dependency>
     <!-- Only needed for testing -->
     <!--dependency>
       <groupId>opensymphony</groupId>
       <artifactId>osuser</artifactId>
       <version>1.0-dev</version>
-    </dependency-->    
-     
+    </dependency-->
+
     <dependency>
       <groupId>javax.activation</groupId>
-      <artifactId>activation</artifactId>      
+      <artifactId>activation</artifactId>
       <version>1.0.2</version>
       <url>http://java.sun.com/products/javabeans/glasgow/jaf.html</url>
     </dependency>
@@ -57,42 +75,42 @@
       <groupId>bsh</groupId>
       <artifactId>bsh</artifactId>
       <version>1.2b7</version>
-    </dependency>    
-           
+    </dependency>
+
     <dependency>
       <groupId>bsf</groupId>
       <artifactId>bsf</artifactId>
       <version>2.3.0</version>
-    </dependency>           
-    
+    </dependency>
+
     <!--  Needed only for testing -->
     <dependency>
       <groupId>fulcrum</groupId>
       <artifactId>fulcrum-testcontainer</artifactId>
       <version>1.0.5</version>
     </dependency>
-    
+
     <dependency>
       <groupId>fulcrum</groupId>
       <artifactId>fulcrum-yaafi</artifactId>
       <version>1.0.4</version>
-    </dependency>  
+    </dependency>
 
 
   </dependencies>
 
   <build>
     <unitTest>
-     <resources>      
-        <resource>   
+     <resources>
+        <resource>
           <directory>${basedir}/src/test</directory>
           <includes>
             <include>*.xml</include>
           </includes>
-        </resource>          
-      </resources>      
+        </resource>
+      </resources>
     </unitTest>
-  </build>  
+  </build>
 
 </project>
 

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/src/java/org/apache/fulcrum/osworkflow/DefaultWorkflowService.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/src/java/org/apache/fulcrum/osworkflow/DefaultWorkflowService.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/osworkflow/src/java/org/apache/fulcrum/osworkflow/DefaultWorkflowService.java (original)
+++ jakarta/turbine/fulcrum/trunk/osworkflow/src/java/org/apache/fulcrum/osworkflow/DefaultWorkflowService.java Fri May  4 23:58:06 2007
@@ -2,19 +2,22 @@
 
 
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 import java.util.Iterator;
@@ -47,7 +50,7 @@
     extends AbstractLogEnabled
     implements WorkflowService, Configurable, Initializable, Disposable, ThreadSafe
 {
-	
+
 	/** The log. */
 	private static Log log = LogFactory.getLog(DefaultWorkflowService.class);
     /**

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/src/java/org/apache/fulcrum/osworkflow/WorkflowInstance.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/src/java/org/apache/fulcrum/osworkflow/WorkflowInstance.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/osworkflow/src/java/org/apache/fulcrum/osworkflow/WorkflowInstance.java (original)
+++ jakarta/turbine/fulcrum/trunk/osworkflow/src/java/org/apache/fulcrum/osworkflow/WorkflowInstance.java Fri May  4 23:58:06 2007
@@ -2,19 +2,22 @@
 
 
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 import java.util.ArrayList;
@@ -127,7 +130,7 @@
      * Executes a special trigger-function using the context of the workflow instance.
      *
      * @param triggerId The id of the special trigger-function
-     * @throws com.opensymphony.workflow.WorkflowException If there is a problem 
+     * @throws com.opensymphony.workflow.WorkflowException If there is a problem
      */
     public void executeTriggerFunction(int triggerId) throws WorkflowException
     {
@@ -194,7 +197,7 @@
     }
     /**
      * Get the workflow descriptor for the workflow instance.
-     * 
+     *
      * @throws com.opensymphony.workflow.WorkflowException If there is a problem
      */
     public WorkflowDescriptor getWorkflowDescriptor() throws WorkflowException

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/src/java/org/apache/fulcrum/osworkflow/WorkflowService.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/src/java/org/apache/fulcrum/osworkflow/WorkflowService.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/osworkflow/src/java/org/apache/fulcrum/osworkflow/WorkflowService.java (original)
+++ jakarta/turbine/fulcrum/trunk/osworkflow/src/java/org/apache/fulcrum/osworkflow/WorkflowService.java Fri May  4 23:58:06 2007
@@ -2,19 +2,22 @@
 
 
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 
@@ -35,22 +38,22 @@
     /** Avalon role - used to id the component within the manager */
     String ROLE = WorkflowService.class.getName();
 
-    /** Retrives a workflow based on the caller 
+    /** Retrives a workflow based on the caller
      * @param caller the value of the caller
      * @return the Workflow for this caller
      */
     public Workflow retrieveWorkflow(String caller);
-    
+
     /** For a specific caller and status, return all the workflows.
-     * 
+     *
      * @param caller the value of the caller
      * @param status the status, defined in the workflow xml file
      * @return an array of longs of the workflow id's
      * @throws com.opensymphony.workflow.WorkflowException if there is a problem
      */
     public long[] retrieveWorkflows(String caller, String status) throws WorkflowException;
-    
-    
+
+
 
 
 }

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/src/java/org/apache/fulcrum/osworkflow/WorkflowServiceFacade.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/src/java/org/apache/fulcrum/osworkflow/WorkflowServiceFacade.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/osworkflow/src/java/org/apache/fulcrum/osworkflow/WorkflowServiceFacade.java (original)
+++ jakarta/turbine/fulcrum/trunk/osworkflow/src/java/org/apache/fulcrum/osworkflow/WorkflowServiceFacade.java Fri May  4 23:58:06 2007
@@ -3,19 +3,22 @@
 
 
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 import com.opensymphony.workflow.Workflow;
@@ -27,7 +30,7 @@
  *
  * This class provides static methods that call related methods of the
  * implementation of the WorkflowService used by the System.
- * 
+ *
  * @version $Id$
  */
 public class WorkflowServiceFacade

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/src/java/org/apache/fulcrum/osworkflow/package.html
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/src/java/org/apache/fulcrum/osworkflow/package.html?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/osworkflow/src/java/org/apache/fulcrum/osworkflow/package.html (original)
+++ jakarta/turbine/fulcrum/trunk/osworkflow/src/java/org/apache/fulcrum/osworkflow/package.html Fri May  4 23:58:06 2007
@@ -1,3 +1,21 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
 <html>
 <head>
 <!-- head part is ignored -->

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/src/test/TestComponentConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/src/test/TestComponentConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/osworkflow/src/test/TestComponentConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/osworkflow/src/test/TestComponentConfig.xml Fri May  4 23:58:06 2007
@@ -1,5 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
 <componentConfig>
     <workflow>
-     
+
     </workflow>
-</componentConfig>
\ No newline at end of file
+</componentConfig>

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/src/test/TestRoleConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/src/test/TestRoleConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/osworkflow/src/test/TestRoleConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/osworkflow/src/test/TestRoleConfig.xml Fri May  4 23:58:06 2007
@@ -1,7 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
 <!-- This configuration file for Avalon components is used for testing the TestComponent -->
 <role-list>
     <role
         name="org.apache.fulcrum.osworkflow.WorkflowService"
         shorthand="workflow"
         default-class="org.apache.fulcrum.osworkflow.DefaultWorkflowService"/>
-</role-list>
\ No newline at end of file
+</role-list>

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/src/test/example.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/src/test/example.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/osworkflow/src/test/example.xml (original)
+++ jakarta/turbine/fulcrum/trunk/osworkflow/src/test/example.xml Fri May  4 23:58:06 2007
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
 <!DOCTYPE workflow PUBLIC "-//OpenSymphony Group//DTD OSWorkflow 2.5//EN" "http://www.opensymphony.com/osworkflow/workflow_2_5.dtd">
 <workflow>
 	<initial-actions>

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/src/test/org/apache/fulcrum/osworkflow/WorkflowServiceFacadeTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/src/test/org/apache/fulcrum/osworkflow/WorkflowServiceFacadeTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/osworkflow/src/test/org/apache/fulcrum/osworkflow/WorkflowServiceFacadeTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/osworkflow/src/test/org/apache/fulcrum/osworkflow/WorkflowServiceFacadeTest.java Fri May  4 23:58:06 2007
@@ -1,18 +1,20 @@
-
 /*
- * Copyright 2000-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.apache.fulcrum.osworkflow;
@@ -25,7 +27,7 @@
 
 import com.opensymphony.workflow.Workflow;
 /**
- * Test the WorkflowServiceFacade.  
+ * Test the WorkflowServiceFacade.
  *
  * @author <a href="epugh@upstate.com">Eric Pugh</a>
  * @version $Id$
@@ -80,7 +82,7 @@
     	// this.lookup causes the workflow service to be configured.
 		this.lookup(WorkflowService.ROLE);
         Workflow wf = WorkflowServiceFacade.retrieveWorkflow("caller");
-		assertNotNull(wf);       
+		assertNotNull(wf);
     }
 
 }

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/src/test/org/apache/fulcrum/osworkflow/WorkflowServiceTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/src/test/org/apache/fulcrum/osworkflow/WorkflowServiceTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/osworkflow/src/test/org/apache/fulcrum/osworkflow/WorkflowServiceTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/osworkflow/src/test/org/apache/fulcrum/osworkflow/WorkflowServiceTest.java Fri May  4 23:58:06 2007
@@ -1,18 +1,20 @@
-
 /*
- * Copyright 2000-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.apache.fulcrum.osworkflow;

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/src/test/osworkflow.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/src/test/osworkflow.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/osworkflow/src/test/osworkflow.xml (original)
+++ jakarta/turbine/fulcrum/trunk/osworkflow/src/test/osworkflow.xml Fri May  4 23:58:06 2007
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
 <osworkflow>
     <persistence class="com.opensymphony.workflow.spi.memory.MemoryWorkflowStore"/>
 

Modified: jakarta/turbine/fulcrum/trunk/osworkflow/src/test/workflows.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/src/test/workflows.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/osworkflow/src/test/workflows.xml (original)
+++ jakarta/turbine/fulcrum/trunk/osworkflow/src/test/workflows.xml Fri May  4 23:58:06 2007
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
 <workflows>
     <workflow name="example" type="resource" location="example.xml"/>
 </workflows>



---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org