You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by ep...@apache.org on 2004/10/29 17:09:35 UTC
cvs commit: jakarta-turbine-fulcrum/security/memory maven.xml
epugh 2004/10/29 08:09:35
Modified: security/adapters/opensymphony maven.xml
security/hibernate maven.xml
security/adapters/turbine maven.xml project.xml
template project.xml
osworkflow/example/src/java/org/apache/fulcrum/osworkflow/example/modules/actions
WorkflowAction.java
security project.xml
osworkflow/example project.xml
security/api project.xml
. maven.xml project.xml
security/nt maven.xml
dvsl/impl .cvsignore
cache project.xml
security/memory maven.xml
Log:
Tighten up list of dependencies and extra compile steps.
Revision Changes Path
1.2 +0 -4 jakarta-turbine-fulcrum/security/adapters/opensymphony/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/security/adapters/opensymphony/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 5 Dec 2003 23:39:08 -0000 1.1
+++ maven.xml 29 Oct 2004 15:09:34 -0000 1.2
@@ -1,7 +1,3 @@
<project default="jar:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util">
- <preGoal name="java:compile">
- <attainGoal name="avalon:meta"/>
- </preGoal>
-
</project>
1.2 +0 -3 jakarta-turbine-fulcrum/security/hibernate/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/security/hibernate/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 5 Dec 2003 23:20:24 -0000 1.1
+++ maven.xml 29 Oct 2004 15:09:34 -0000 1.2
@@ -1,7 +1,4 @@
<project default="jar:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util">
- <preGoal name="java:compile">
- <attainGoal name="avalon:meta"/>
- </preGoal>
</project>
1.2 +0 -3 jakarta-turbine-fulcrum/security/adapters/turbine/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/security/adapters/turbine/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 5 Dec 2003 23:33:16 -0000 1.1
+++ maven.xml 29 Oct 2004 15:09:34 -0000 1.2
@@ -1,7 +1,4 @@
<project default="jar:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util">
- <preGoal name="java:compile">
- <attainGoal name="avalon:meta"/>
- </preGoal>
</project>
1.11 +6 -0 jakarta-turbine-fulcrum/security/adapters/turbine/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/security/adapters/turbine/project.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- project.xml 16 Oct 2004 17:31:30 -0000 1.10
+++ project.xml 29 Oct 2004 15:09:34 -0000 1.11
@@ -36,6 +36,12 @@
<artifactId>commons-beanutils</artifactId>
<version>1.6.1</version>
</dependency>
+
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>1.0</version>
+ </dependency>
<!-- Needed only for the Turbine Adapter -->
1.8 +9 -2 jakarta-turbine-fulcrum/template/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/template/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 24 Oct 2004 11:41:09 -0000 1.7
+++ project.xml 29 Oct 2004 15:09:34 -0000 1.8
@@ -13,11 +13,18 @@
<version>20030310.165926</version>
<url>http://jakarta.apache.org/commons/sandbox/email</url>
</dependency>
-
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.0</version>
+ <url>http://jakarta.apache.org/commons/sandbox/email</url>
+ </dependency>
+
<dependency>
<groupId>velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.3.1</version>
+ <version>1.4</version>
<url>http://jakarta.apache.org/velocity</url>
</dependency>
1.4 +9 -4 jakarta-turbine-fulcrum/osworkflow/example/src/java/org/apache/fulcrum/osworkflow/example/modules/actions/WorkflowAction.java
Index: WorkflowAction.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/osworkflow/example/src/java/org/apache/fulcrum/osworkflow/example/modules/actions/WorkflowAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WorkflowAction.java 10 Oct 2003 15:11:31 -0000 1.3
+++ WorkflowAction.java 29 Oct 2004 15:09:34 -0000 1.4
@@ -65,9 +65,9 @@
import org.apache.turbine.util.RunData;
import org.apache.velocity.context.Context;
-import com.opensymphony.module.user.Group;
-import com.opensymphony.module.user.User;
-import com.opensymphony.module.user.UserManager;
+//import com.opensymphony.module.user.Group;
+//import com.opensymphony.module.user.User;
+//import com.opensymphony.module.user.UserManager;
import com.opensymphony.workflow.Workflow;
/**
* This action contains all the manipulations of a workflow. Look at the various
@@ -130,7 +130,7 @@
{
log.debug("doSetupuser action event called");
data.setScreenTemplate("Index.vm");
- UserManager um = UserManager.getInstance();
+ /* UserManager um = UserManager.getInstance();
User test = um.createUser("test");
test.setPassword("test");
Group foos = um.createGroup("foos");
@@ -144,6 +144,11 @@
"",
"INFO",
"User test/test is setup in system. Don't forget to login!");
+ */
+ data.getMessages().setMessage(
+ "",
+ "INFO",
+ "Please uncomment the code in WorkflowAction.doSetupuser and add OSUser!");
}
/**
1.17 +10 -0 jakarta-turbine-fulcrum/security/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/security/project.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- project.xml 16 Oct 2004 17:31:30 -0000 1.16
+++ project.xml 29 Oct 2004 15:09:34 -0000 1.17
@@ -28,6 +28,16 @@
</contributors>
<dependencies>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.3</version>
+ </dependency>
<!-- testing -->
<dependency>
<groupId>fulcrum</groupId>
1.16 +2 -2 jakarta-turbine-fulcrum/osworkflow/example/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/osworkflow/example/project.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- project.xml 16 Oct 2004 17:31:30 -0000 1.15
+++ project.xml 29 Oct 2004 15:09:35 -0000 1.16
@@ -84,7 +84,7 @@
<war.bundle>true</war.bundle>
</properties>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>opensymphony</groupId>
<artifactId>osuser</artifactId>
<version>1.0-dev</version>
@@ -92,7 +92,7 @@
<properties>
<war.bundle>true</war.bundle>
</properties>
- </dependency>
+ </dependency-->
<dependency>
<groupId>taglibs</groupId>
1.10 +0 -5 jakarta-turbine-fulcrum/security/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/security/api/project.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- project.xml 16 Oct 2004 17:31:30 -0000 1.9
+++ project.xml 29 Oct 2004 15:09:35 -0000 1.10
@@ -31,11 +31,6 @@
<version>1.1</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- </dependency>
</dependencies>
1.23 +1 -1 jakarta-turbine-fulcrum/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/maven.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- maven.xml 18 Oct 2004 11:48:25 -0000 1.22
+++ maven.xml 29 Oct 2004 15:09:35 -0000 1.23
@@ -9,7 +9,7 @@
<goal name="fulcrum:build" description="Build all Fulcrum components">
<maven:reactor basedir="${basedir}"
includes="**/project.xml"
- excludes="proposals/**,target/**,project.xml,cache/**,configuration/**"
+ excludes="proposals/**,target/**,project.xml,cache/**,configuration/**,quartz/**"
goals="jar:install"
banner="Installing:"
ignoreFailures="false" />
1.89 +22 -47 jakarta-turbine-fulcrum/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/project.xml,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- project.xml 19 Oct 2004 22:04:47 -0000 1.88
+++ project.xml 29 Oct 2004 15:09:35 -0000 1.89
@@ -160,94 +160,69 @@
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>4.1.5</version>
+ <version>4.2.0</version>
</dependency>
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
- <version>4.1.5</version>
+ <version>4.2.0</version>
</dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.0</version>
- </dependency>
-
<!--
|
| Common test-time dependencies for all the components.
|
-->
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>20030203.000550</version>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.3</version>
- <url>http://jakarta.apache.org/commons/logging.html</url>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.8</version>
- <url>http://jakarta.apache.org/log4j/</url>
- </dependency>
-
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>2.1</version>
- <url>http://jakarta.apache.org/commons/collections.html</url>
- </dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <version>20030706.202021</version>
- <url>http://jakarta.apache.org/commons/sandbox/configuration</url>
- </dependency>
-
- <dependency>
<groupId>excalibur-component</groupId>
<artifactId>excalibur-component</artifactId>
<version>1.1</version>
<url>http://excalibur.apache.org/</url>
</dependency>
-
+
<dependency>
<groupId>excalibur-instrument</groupId>
<artifactId>excalibur-instrument</artifactId>
<version>1.0</version>
<url>http://excalibur.apache.org/</url>
- </dependency>
-
+ </dependency>
+
<dependency>
<groupId>excalibur-logger</groupId>
<artifactId>excalibur-logger</artifactId>
<version>1.1</version>
<url>http://excalibur.apache.org/</url>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.0</version>
+ <url>http://jakarta.apache.org/commons/collections.html</url>
</dependency>
-
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.8</version>
+ <url>http://jakarta.apache.org/log4j/</url>
+ </dependency>
+
<dependency>
<groupId>excalibur-pool</groupId>
<artifactId>excalibur-pool-api</artifactId>
<version>2.0.0</version>
<url>http://excalibur.apache.org/</url>
</dependency>
-
+
<dependency>
<groupId>avalon-logkit</groupId>
<artifactId>avalon-logkit</artifactId>
<version>2.0.0</version>
<url>http://avalon.apache.org</url>
- </dependency>
+ </dependency>
</dependencies>
1.2 +0 -3 jakarta-turbine-fulcrum/security/nt/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/security/nt/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 5 Dec 2003 23:22:18 -0000 1.1
+++ maven.xml 29 Oct 2004 15:09:35 -0000 1.2
@@ -1,7 +1,4 @@
<project default="jar:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util">
- <preGoal name="java:compile">
- <attainGoal name="avalon:meta"/>
- </preGoal>
</project>
1.3 +1 -0 jakarta-turbine-fulcrum/dvsl/impl/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/dvsl/impl/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 8 Dec 2003 20:40:03 -0000 1.2
+++ .cvsignore 29 Oct 2004 15:09:35 -0000 1.3
@@ -4,3 +4,4 @@
.project
jcoverage.ser
.merlin
+junit*.properties
1.9 +1 -9 jakarta-turbine-fulcrum/cache/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/cache/project.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project.xml 20 Oct 2004 12:57:34 -0000 1.8
+++ project.xml 29 Oct 2004 15:09:35 -0000 1.9
@@ -5,15 +5,7 @@
<name>Fulcrum Cache Component</name>
<currentVersion>1.0.4</currentVersion>
- <dependencies>
-
- <!-- Needed only for testing -->
- <dependency>
- <groupId>fulcrum</groupId>
- <artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.3</version>
- </dependency>
-
+ <dependencies>
</dependencies>
1.2 +0 -3 jakarta-turbine-fulcrum/security/memory/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/security/memory/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 5 Dec 2003 23:21:54 -0000 1.1
+++ maven.xml 29 Oct 2004 15:09:35 -0000 1.2
@@ -1,7 +1,4 @@
<project default="jar:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util">
- <preGoal name="java:compile">
- <attainGoal name="avalon:meta"/>
- </preGoal>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org