Index: maven.xml
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/maven.xml,v
retrieving revision 1.59
diff -u -r1.59 maven.xml
--- maven.xml	22 May 2004 21:34:56 -0000	1.59
+++ maven.xml	23 May 2004 18:54:35 -0000
@@ -360,8 +360,6 @@
   <goal name="db.create.production">
     <attainGoal name="db.production.properties"/>
     <attainGoal name="db.create"/>
-    <j:set var="database.arg.script" value="./src/sql/populate-userinfo-for-default-psml.sql" />
-    <attainGoal name="db.execute" />
   </goal>
 
   <goal name="db.create">
Index: portal/maven.xml
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/portal/maven.xml,v
retrieving revision 1.75
diff -u -r1.75 maven.xml
--- portal/maven.xml	21 May 2004 18:31:37 -0000	1.75
+++ portal/maven.xml	23 May 2004 18:54:46 -0000
@@ -181,7 +181,7 @@
             <arg value="jetspeed" />
         </java>
   </goal>
-  
+
   <goal name="pam.securitydeploy">
          <java classname="org.apache.jetspeed.tools.pamanager.PortletApplicationManager" fork="yes">
           <classpath>
@@ -278,7 +278,7 @@
             <arg value="webapp" />
         </java>
   </goal>
-  
+
   <goal name="pam.securityundeploy">
          <java classname="org.apache.jetspeed.tools.pamanager.PortletApplicationManager" fork="yes">
           <classpath>
@@ -500,16 +500,25 @@
 
   <goal name="db.entities">
     <j:set var="dbase" value="${org.apache.jetspeed.production.database.default.name}"/>
-    <j:choose>    
+    <attainGoal name="db.production.properties"/>
+    <j:choose>
 	    <j:when test="${dbase == 'mysql'}" >
         	<j:set var="database.arg.script" value="../src/sql/mysql/populate-entities-for-default-psml.sql" />
 	    </j:when>
 	    <j:otherwise>
         	<j:set var="database.arg.script" value="../src/sql/populate-entities-for-default-psml.sql" />
 	    </j:otherwise>
-	</j:choose>	
-    <attainGoal name="db.production.properties"/>
-    <attainGoal name="db.execute" />	
+  	</j:choose>
+    <attainGoal name="db.execute" />
+    <j:choose>
+      <j:when test="${dbase == 'oracle'}" >
+          <j:set var="database.arg.script" value="../src/sql/oracle/populate-userinfo-for-default-psml.sql" />
+      </j:when>
+      <j:otherwise>
+          <j:set var="database.arg.script" value="../src/sql/populate-userinfo-for-default-psml.sql" />
+      </j:otherwise>
+    </j:choose>
+    <attainGoal name="db.execute" />
   </goal>
 
   <goal name="ojb.set.production.database.platform">
@@ -542,7 +551,7 @@
     <attainGoal name="dbsetup"/>
   </preGoal>
 
-  <goal name="dbsetup">  
+  <goal name="dbsetup">
     <attainGoal name="db.test.properties"/>
     <copy file="src/java/repository_database.xml" todir="${maven.test.dest}" overwrite="true">
     <filterset begintoken="@" endtoken="@">
@@ -556,10 +565,10 @@
 
   <goal name='remove.wars'>
     <delete dir="${deploy.war.dir}/${webapp.name}"/>
-    <delete file="${deploy.war.dir}/${webapp.name}.war"/>    
+    <delete file="${deploy.war.dir}/${webapp.name}.war"/>
     <delete dir="${deploy.war.dir}/HW_App"/>
     <delete dir="${deploy.war.dir}/security"/>
-    <delete dir="${deploy.war.dir}/struts-demo"/>      
+    <delete dir="${deploy.war.dir}/struts-demo"/>
   </goal>
-    
+
 </project>
Index: src/sql/oracle/populate-userinfo-for-default-psml.sql
===================================================================
RCS file: src/sql/oracle/populate-userinfo-for-default-psml.sql
diff -N src/sql/oracle/populate-userinfo-for-default-psml.sql
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/sql/oracle/populate-userinfo-for-default-psml.sql	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,9 @@
+INSERT INTO PREFS_NODE VALUES(1,NULL,'',0,'/',to_date('2004-05-22 14:57:53','YYYY-MM-DD HH24:MI:SS'),to_date('2004-05-22 14:57:53','YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO PREFS_NODE VALUES(101,1,'user',0,'/user',to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'),to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO PREFS_NODE VALUES(102,101,'admin',0,'/user/admin',to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'),to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO PREFS_NODE VALUES(103,102,'userinfo',0,'/user/admin/userinfo',to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'),to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO SECURITY_PRINCIPAL VALUES(1,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl','/user/admin',to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'),to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO PREFS_PROPERTY_KEY VALUES(61,'user.name.given',3,to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'),to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO PREFS_PROPERTY_VALUE VALUES(41,103,61,0,NULL,0,0.0E0,'Test Dude',to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'),to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO PREFS_PROPERTY_KEY VALUES(62,'user.name.family',3,to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'),to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO PREFS_PROPERTY_VALUE VALUES(42,103,62,0,NULL,0,0.0E0,'Dudley',to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'),to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'));