taylor 2002/06/20 18:13:02
Modified: build Tag: security_14 build.xml
build/torque Tag: security_14 build.properties build.xml
src/java/org/apache/jetspeed/om/dbpsml Tag: security_14
JetspeedGroupProfilePeer.java
JetspeedRoleProfilePeer.java
JetspeedUserProfilePeer.java
src/java/org/apache/jetspeed/om/dbpsml/map Tag: security_14
JetspeedGroupProfileMapBuilder.java
JetspeedRoleProfileMapBuilder.java
JetspeedUserProfileMapBuilder.java
webapp/WEB-INF/conf Tag: security_14
JetspeedSecurity.properties
Added: build/torque Tag: security_14 dbpsml.properties
Log:
- Auto-DBPSML Generation added to Build
From the previous commit (i lost the comment accidently)
- decoupled db-psml from Turbine security (looks like somebody already did most of
the work)
- removed generated files from cvs
- added back in dbpsml-schema.xml, since I can't get Torque to generate tables to
different packages
Revision Changes Path
No revision
No revision
1.142.2.15 +23 -2 jakarta-jetspeed/build/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/build/build.xml,v
retrieving revision 1.142.2.14
retrieving revision 1.142.2.15
diff -u -r1.142.2.14 -r1.142.2.15
--- build.xml 20 Jun 2002 03:12:00 -0000 1.142.2.14
+++ build.xml 21 Jun 2002 01:13:02 -0000 1.142.2.15
@@ -167,7 +167,7 @@
<!-- Compiles the class files -->
<!-- =================================================================== -->
<target
- name="compile" depends="apis,om"
+ name="compile" depends="apis,om,dbpsml"
description="Compiles the class files"
>
@@ -1005,7 +1005,28 @@
unless="omBuild.notRequired"
description="Generate Object Model sources">
- <ant antfile="build.xml" dir="./build/torque"/>
+ <ant antfile="build.xml" dir="./build/torque">
+ <property name="build.properties" value="build.properties"/>
+ </ant>
+
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Object Model -->
+ <!-- =================================================================== -->
+ <target name="check_dbpsml">
+ <uptodate property="omBuild.notRequired2"
targetfile="./src/sql/dbpsml-schema.sql">
+ <srcfiles dir= "./build/torque/schema"
includes="dbpsml-schema.xml"/>
+ </uptodate>
+ </target>
+
+ <target name="dbpsml" depends="check_dbpsml"
+ unless="omBuild.notRequired2"
+ description="Generate DBPSML Object Model sources">
+
+ <ant antfile="build.xml" dir="./build/torque">
+ <property name="build.properties" value="dbpsml.properties"/>
+ </ant>
</target>
No revision
No revision
1.4.2.4 +0 -2 jakarta-jetspeed/build/torque/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/build/torque/build.properties,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -r1.4.2.3 -r1.4.2.4
--- build.properties 21 Jun 2002 00:43:10 -0000 1.4.2.3
+++ build.properties 21 Jun 2002 01:13:02 -0000 1.4.2.4
@@ -24,9 +24,7 @@
# the project name selected.
# -------------------------------------------------------------------
-# project=dbpsml
project=security
-# targetPackage=org.apache.jetspeed.om.dbpsml
targetPackage=org.apache.jetspeed.om.security.turbine
# -------------------------------------------------------------------
1.12.2.1 +3 -0 jakarta-jetspeed/build/torque/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/build/torque/build.xml,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -r1.12 -r1.12.2.1
--- build.xml 8 Apr 2002 11:17:28 -0000 1.12
+++ build.xml 21 Jun 2002 01:13:02 -0000 1.12.2.1
@@ -24,7 +24,10 @@
information stored in the properties file.
-->
+<!--
<property name="build.properties" value="build.properties"/>
+ -->
+
<property file="${build.properties}"/>
<!-- ================================================================ -->
No revision
No revision
1.1.2.1 +183 -0 jakarta-jetspeed/build/torque/Attic/dbpsml.properties
No revision
No revision
1.4.2.3 +1 -0
jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/JetspeedGroupProfilePeer.java
Index: JetspeedGroupProfilePeer.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/JetspeedGroupProfilePeer.java,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- JetspeedGroupProfilePeer.java 21 Jun 2002 00:43:11 -0000 1.4.2.2
+++ JetspeedGroupProfilePeer.java 21 Jun 2002 01:13:02 -0000 1.4.2.3
@@ -32,6 +32,7 @@
* long as it does not already exist in the output directory.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Atul Dambalkar</a>
+ * @version $Id$
*/
public class JetspeedGroupProfilePeer
extends org.apache.jetspeed.om.dbpsml.BaseJetspeedGroupProfilePeer
1.4.2.3 +1 -0
jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/JetspeedRoleProfilePeer.java
Index: JetspeedRoleProfilePeer.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/JetspeedRoleProfilePeer.java,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- JetspeedRoleProfilePeer.java 21 Jun 2002 00:43:11 -0000 1.4.2.2
+++ JetspeedRoleProfilePeer.java 21 Jun 2002 01:13:02 -0000 1.4.2.3
@@ -34,6 +34,7 @@
* long as it does not already exist in the output directory.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Atul Dambalkar</a>
+ * @version $Id$
*/
public class JetspeedRoleProfilePeer
extends org.apache.jetspeed.om.dbpsml.BaseJetspeedRoleProfilePeer
1.4.2.2 +1 -0
jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/JetspeedUserProfilePeer.java
Index: JetspeedUserProfilePeer.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/JetspeedUserProfilePeer.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- JetspeedUserProfilePeer.java 21 Jun 2002 00:43:11 -0000 1.4.2.1
+++ JetspeedUserProfilePeer.java 21 Jun 2002 01:13:02 -0000 1.4.2.2
@@ -41,6 +41,7 @@
* long as it does not already exist in the output directory.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Atul Dambalkar</a>
+ * @version $Id$
*/
public class JetspeedUserProfilePeer
extends org.apache.jetspeed.om.dbpsml.BaseJetspeedUserProfilePeer
No revision
No revision
1.2.2.2 +1 -1
jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/map/JetspeedGroupProfileMapBuilder.java
Index: JetspeedGroupProfileMapBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/map/JetspeedGroupProfileMapBuilder.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- JetspeedGroupProfileMapBuilder.java 21 Jun 2002 00:43:11 -0000 1.2.2.1
+++ JetspeedGroupProfileMapBuilder.java 21 Jun 2002 01:13:02 -0000 1.2.2.2
@@ -11,7 +11,7 @@
/**
* This class was autogenerated by Torque on:
*
- * [Thu Jun 20 17:39:11 PDT 2002]
+ * [Thu Jun 20 18:09:24 PDT 2002]
*
*/
public class JetspeedGroupProfileMapBuilder implements MapBuilder
1.2.2.2 +1 -1
jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/map/JetspeedRoleProfileMapBuilder.java
Index: JetspeedRoleProfileMapBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/map/JetspeedRoleProfileMapBuilder.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- JetspeedRoleProfileMapBuilder.java 21 Jun 2002 00:43:11 -0000 1.2.2.1
+++ JetspeedRoleProfileMapBuilder.java 21 Jun 2002 01:13:02 -0000 1.2.2.2
@@ -11,7 +11,7 @@
/**
* This class was autogenerated by Torque on:
*
- * [Thu Jun 20 17:39:11 PDT 2002]
+ * [Thu Jun 20 18:09:24 PDT 2002]
*
*/
public class JetspeedRoleProfileMapBuilder implements MapBuilder
1.2.2.2 +1 -1
jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/map/JetspeedUserProfileMapBuilder.java
Index: JetspeedUserProfileMapBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/map/JetspeedUserProfileMapBuilder.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- JetspeedUserProfileMapBuilder.java 21 Jun 2002 00:43:11 -0000 1.2.2.1
+++ JetspeedUserProfileMapBuilder.java 21 Jun 2002 01:13:02 -0000 1.2.2.2
@@ -11,7 +11,7 @@
/**
* This class was autogenerated by Torque on:
*
- * [Thu Jun 20 17:39:11 PDT 2002]
+ * [Thu Jun 20 18:09:24 PDT 2002]
*
*/
public class JetspeedUserProfileMapBuilder implements MapBuilder
No revision
No revision
1.1.2.24 +0 -0
jakarta-jetspeed/webapp/WEB-INF/conf/Attic/JetspeedSecurity.properties
Index: JetspeedSecurity.properties
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/Attic/JetspeedSecurity.properties,v
retrieving revision 1.1.2.23
retrieving revision 1.1.2.24
diff -u -r1.1.2.23 -r1.1.2.24
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
