portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r746641 [5/5] - in /portals/jetspeed-2/portal/branches/JPA_BRANCH: applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/portal-admin/ applications/jetspeed/src/main/webapp/WEB-INF/pages/ applications/jetspeed/src/main/weba...
Date Sun, 22 Feb 2009 06:06:23 GMT
Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-installer/etc/database/build.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-installer/etc/database/build.xml?rev=746641&r1=746640&r2=746641&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-installer/etc/database/build.xml
(original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-installer/etc/database/build.xml
Sun Feb 22 06:06:20 2009
@@ -72,33 +72,33 @@
 
 	</target>
 
-	<target name="setupNoDB">
-		<antcall target="setupDBPSML" />
-	</target>
+	<target name="runSetupDB" depends="checkDerby,checkImportPsml,generateStandardDB,generateDerbyDB,copyJetspeedContext,filterSpringFilterKey,seedDB,dbPsml"
/>
+
+	<target name="runSetupNoDB" depends="checkImportPsml,copyJetspeedContext,filterSpringFilterKey"
/>
 
 	<target name="checkInput" unless="failSetup">
 		<antcall target="runSetupDB" />
 	</target>
 
-	<target name='setupDBPSML'>
-		<copy file="${jetspeedWebInfDir}/assembly/page-manager.xml" tofile="${jetspeedWebInfDir}/assembly/alternate/fs-page-manager.xml"
/>
-	</target>
-
-	<target name="runSetupDB" depends="setupDBPSML,checkDerby,generateStandardDB,generateDerbyDB,copyJetspeedContext,filterSpringDatasource,seedDB,do-psml"
/>
-
 	<target name="checkDerby">
 		<condition property="_derby">
 			<equals arg1="${db.type}" arg2="derby" />
 		</condition>
 	</target>
 
+	<target name="checkImportPsml">
+		<condition property="_doImportPsml">
+			<equals arg1="${dbImportPsml}" arg2="true" />
+		</condition>
+	</target>
+
 	<target name="generateDerbyDB" if="_derby">
 		<delete dir="${basedir}/derby/productiondb" quiet="true" />
 		<echo>Executing file ${basedir}/derby/create-schema.sql</echo>
 
 		<java classname="org.apache.jetspeed.anttasks.ExecuteJavaSQL" fork="yes">
 			<classpath>
-				<fileset dir="${basedir}/../shared/lib">
+				<fileset dir="${basedir}/../lib">
 					<include name="**/*.jar" />
 				</fileset>
 				<fileset dir="${jetspeedWebInfDir}/lib">
@@ -107,10 +107,7 @@
 				<fileset dir="${basedir}/lib">
 					<include name="**/*.jar" />
 				</fileset>
-				<fileset dir="${basedir}/../common/lib">
-					<include name="**/*.jar" />
-				</fileset>
-				<pathelement location="${basedir}/../shared/classes" />
+				<pathelement location="${basedir}/../lib" />
 				<pathelement location="${jetspeedWebInfDir}/classes" />
 			</classpath>
 			<arg line="driver=&quot;${_jdbc.driver.class}&quot; 
@@ -127,7 +124,7 @@
 
 		<sql driver="${_jdbc.driver.class}" url="${_jdbc.url}" userid="${_db.username}" password="${_db.password}"
src="${basedir}/${db.type}/drop-schema.sql" autocommit="true" onerror="continue" print="no"
output="setup.log">
 			<classpath>
-				<fileset dir="${basedir}/../shared/lib">
+				<fileset dir="${basedir}/../lib">
 					<include name="**/*.jar" />
 				</fileset>
 			</classpath>
@@ -136,7 +133,7 @@
 		<echo>Starting database generation</echo>
 		<sql driver="${_jdbc.driver.class}" url="${_jdbc.url}" userid="${_db.username}" password="${_db.password}"
src="${basedir}/${db.type}/create-schema.sql">
 			<classpath>
-				<fileset dir="${basedir}/../shared/lib">
+				<fileset dir="${basedir}/../lib">
 					<include name="**/*.jar" />
 				</fileset>
 			</classpath>
@@ -146,7 +143,7 @@
 	</target>
 
 	<target name="copyJetspeedContext">
-		<copy file="${portalName}.xml" tofile="${basedir}/../conf/Catalina/localhost/${portalName}.xml"
overwrite="true">
+		<copy file="resources/${portalName}.xml" tofile="${basedir}/../conf/Catalina/localhost/${portalName}.xml"
overwrite="true">
 
 			<!-- note that the $ is escaped here -->
 			<filterset begintoken="$${" endtoken="}">
@@ -158,18 +155,30 @@
 		</copy>
 	</target>
 
-	<target name="filterSpringDatasource">
-		<copy file="${jetspeedWebInfDir}/assembly/boot/datasource.xml" tofile="${jetspeedWebInfDir}/assembly/boot/datasource_filtered.xml">
+	<target name="filterSpringFilterKey">
+		<delete quiet="true" file="${jetspeedWebInfDir}/conf/spring-filter-key.properties" />
+
+		<!-- Ant's if/else simulation, _doImportPsml has been set before -->
+		<antcall target="filterSpringFilterKey_db"/>
+		<antcall target="filterSpringFilterKey_file"/>
+	</target>
+
+	<target name="filterSpringFilterKey_db" if="_doImportPsml">
+		<copy file="resources/spring-filter-key.properties" todir="${jetspeedWebInfDir}/conf/">
+			<!-- note that the $ is escaped here -->
+			<filterset begintoken="$${" endtoken="}">
+				<filter token="org.apache.jetspeed.spring.filter.key" value="portal.dbPageManager"
/>
+			</filterset>
+		</copy>
+	</target>
+
+	<target name="filterSpringFilterKey_file" unless="_doImportPsml">
+		<copy file="resources/spring-filter-key.properties" todir="${jetspeedWebInfDir}/conf/">
 			<!-- note that the $ is escaped here -->
 			<filterset begintoken="$${" endtoken="}">
-				<filter token="org.apache.jetspeed.database.user" value="${_db.username}" />
-				<filter token="org.apache.jetspeed.database.password" value="${_db.password}" />
-				<filter token="org.apache.jetspeed.database.driver" value="${_jdbc.driver.class}"
/>
-				<filter token="org.apache.jetspeed.database.url" value="${_jdbc.url}" />
+				<filter token="org.apache.jetspeed.spring.filter.key" value="portal" />
 			</filterset>
 		</copy>
-		<move file="${jetspeedWebInfDir}/assembly/boot/datasource_filtered.xml" tofile="${jetspeedWebInfDir}/assembly/boot/datasource.xml"
overwrite="true" />
-		<delete file="${jetspeedWebInfDir}/assembly/boot/datasource_filtered.xml" />
 	</target>
 
 	<target name="seedDB">
@@ -178,7 +187,7 @@
 
 		<java classname="org.apache.jetspeed.tools.db.serializer.JetspeedSerializerApplicationImpl"
fork="yes">
 			<classpath>
-				<fileset dir="${basedir}/../shared/lib">
+				<fileset dir="${basedir}/../lib">
 					<include name="**/*.jar" />
 				</fileset>
 				<fileset dir="${jetspeedWebInfDir}/lib">
@@ -187,14 +196,16 @@
 				<fileset dir="${basedir}/lib">
 					<include name="**/*.jar" />
 				</fileset>
-				<fileset dir="${basedir}/../common/lib">
-					<include name="**/*.jar" />
-				</fileset>
-				<pathelement location="${basedir}/../shared/classes" />
+				<pathelement location="${basedir}/../lib" />
 				<pathelement location="${jetspeedWebInfDir}/classes" />
 			</classpath>
 
-			<arg line="-I &quot;${basedir}/j2-seed.xml&quot; 
+            <sysproperty key="org.apache.jetspeed.database.user" value="${_db.username}"/>
+	        <sysproperty key="org.apache.jetspeed.database.password" value="${_db.password}"/>
+	        <sysproperty key="org.apache.jetspeed.database.url" value="${_jdbc.url}"/>
+	        <sysproperty key="org.apache.jetspeed.database.driver" value="${_jdbc.driver.class}"/>
+	        	
+			<arg line="-I &quot;${basedir}/resources/j2-seed.xml&quot; 
               -a &quot;${basedir}/../webapps/${portalName}&quot;
       		  -c &quot;serializer&quot;
       	      -p &quot;${jetspeedWebInfDir}/conf/spring-filter.properties&quot;" />
@@ -202,42 +213,30 @@
 
 	</target>
 
-	<!-- Populate database with pages the user has selected so -->
-	<target name="do-psml" depends="test-import-psml,db-psml,fs-psml" />
-
-	<target name="test-import-psml">
-		<condition property="_doImportPsml">
-			<equals arg1="${dbImportPsml}" arg2="true" />
-		</condition>
-	</target>
-
-	<target name="fs-psml" unless="_doImportPsml">
-		<copy file="${jetspeedWebInfDir}/assembly/alternate/fs-page-manager.xml" tofile="${jetspeedWebInfDir}/assembly/page-manager.xml"
overwrite="true" />
-		<delete quiet="true" file="${jetspeedWebInfDir}/assembly/interceptors.xml" />
-	</target>
-
-	<target name="db-psml" if="_doImportPsml">
+	<target name="dbPsml" if="_doImportPsml">
 
 	    <echo>Importing psml into the database</echo>
 
 	    <java classname="org.apache.jetspeed.tools.page.serializer.JetspeedPageSerializerApplicationImpl"
fork="yes">
 	      <classpath>
-	        <fileset dir="${basedir}/../shared/lib">
-	          <include name="**/*.jar" />
-	        </fileset>
-	        <fileset dir="${jetspeedWebInfDir}/lib">
-	          <include name="**/*.jar" />
-	        </fileset>
-	        <fileset dir="${basedir}/lib">
-	          <include name="**/*.jar" />
-	        </fileset>
-	        <fileset dir="${basedir}/../common/lib">
-	          <include name="**/*.jar" />
-	        </fileset>
-	        <pathelement location="${basedir}/../shared/classes" />
-	        <pathelement location="${jetspeedWebInfDir}/classes" />
+			<fileset dir="${basedir}/../lib">
+				<include name="**/*.jar" />
+			</fileset>
+			<fileset dir="${jetspeedWebInfDir}/lib">
+				<include name="**/*.jar" />
+			</fileset>
+			<fileset dir="${basedir}/lib">
+				<include name="**/*.jar" />
+			</fileset>
+			<pathelement location="${basedir}/../lib" />
+			<pathelement location="${jetspeedWebInfDir}/classes" />
 	      </classpath>
 
+          <sysproperty key="org.apache.jetspeed.database.user" value="${_db.username}"/>
+          <sysproperty key="org.apache.jetspeed.database.password" value="${_db.password}"/>
+          <sysproperty key="org.apache.jetspeed.database.url" value="${_jdbc.url}"/>
+          <sysproperty key="org.apache.jetspeed.database.driver" value="${_jdbc.driver.class}"/>
+
 	      <arg
 	        line="-I &quot;/&quot;
 	              -a &quot;${basedir}/../webapps/${portalName}&quot;

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-installer/jetspeed-mvn-database-pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-installer/jetspeed-mvn-database-pom.xml?rev=746641&r1=746640&r2=746641&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-installer/jetspeed-mvn-database-pom.xml
(original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-installer/jetspeed-mvn-database-pom.xml
Sun Feb 22 06:06:20 2009
@@ -104,10 +104,18 @@
         </exclusion>
         <exclusion>
           <groupId>org.apache.portals.jetspeed-2</groupId>
+          <artifactId>jetspeed-rdbms</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.portals.jetspeed-2</groupId>
           <artifactId>jetspeed-registry</artifactId>
         </exclusion>
         <exclusion>
           <groupId>org.apache.portals.jetspeed-2</groupId>
+          <artifactId>jetspeed-sso</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.portals.jetspeed-2</groupId>
           <artifactId>jetspeed-id-generator</artifactId>
         </exclusion>
         <exclusion>
@@ -134,6 +142,14 @@
           <groupId>org.apache.portals.jetspeed-2</groupId>
           <artifactId>jetspeed-serializer</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.springframework</groupId>
+          <artifactId>spring</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.springframework</groupId>
+          <artifactId>spring-ojb</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
   </dependencies>
@@ -171,9 +187,8 @@
             <configuration>
               <tasks>
                 <copy file="${project.build.directory}/resources/tomcat/context.xml"
-                  tofile="${project.build.directory}/database/${org.apache.jetspeed.portal.context.name}.xml"
-                />
-              </tasks>
+                  tofile="${project.build.directory}/database/resources/${org.apache.jetspeed.portal.context.name}.xml"
/>
+               </tasks>
             </configuration>
             <goals>
               <goal>run</goal>
@@ -207,11 +222,7 @@
                   <resource>
                     <path>@seed.path@</path>
                     <include>j2-seed.xml</include>
-                    <destination>database</destination>
-                  </resource>
-                  <resource>
-                    <path>db-ojb</path>
-                    <destination>database/import/db-ojb</destination>
+                    <destination>database/resources</destination>
                   </resource>
                   <resource>
                     <path>ddl</path>
@@ -257,3 +268,6 @@
   </build>
 
 </project>
+
+
+

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml?rev=746641&r1=746640&r2=746641&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
(original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
Sun Feb 22 06:06:20 2009
@@ -38,10 +38,12 @@
   <packaging>pom</packaging>
 
   <properties>
+    <tomcat.version.major>6</tomcat.version.major>
+    <tomcat.version.minor>6.0.18</tomcat.version.minor>
+    <tomcat.name>apache-tomcat-${tomcat.version.minor}</tomcat.name>
     <org.apache.portals.jetspeed.version>${pom.version}</org.apache.portals.jetspeed.version>
     <org.apache.jetspeed.portal.context.name>jetspeed</org.apache.jetspeed.portal.context.name>
-    <tomcat.version>apache-tomcat-5.5.27</tomcat.version>
-    <org.apache.jetspeed.portal.home>${project.build.directory}/${tomcat.version}</org.apache.jetspeed.portal.home>
+    <org.apache.jetspeed.portal.home>${project.build.directory}/${tomcat.name}</org.apache.jetspeed.portal.home>
   </properties>
 
   <build>
@@ -67,16 +69,13 @@
                   <tasks>
                     <mkdir dir="resources"/>
                     <get usetimestamp="true"
-                      src="http://archive.apache.org/dist/tomcat/tomcat-5/v5.5.27/bin/${tomcat.version}.zip"
-                      dest="resources/${tomcat.version}.zip"/>
-                    <unzip src="resources/${tomcat.version}.zip" dest="${project.build.directory}"
+                      src="http://archive.apache.org/dist/tomcat/tomcat-${tomcat.version.major}/v${tomcat.version.minor}/bin/${tomcat.name}.zip"
+                      dest="resources/${tomcat.name}.zip"/>
+                    <unzip src="resources/${tomcat.name}.zip" dest="${project.build.directory}"
                       overwrite="false"/>
 
-                    <delete dir="${org.apache.jetspeed.portal.home}/webapps/balancer"/>
-                    <delete dir="${org.apache.jetspeed.portal.home}/webapps/jsp-examples"/>
-                    <delete dir="${org.apache.jetspeed.portal.home}/webapps/servlets-examples"/>
-                    <delete dir="${org.apache.jetspeed.portal.home}/webapps/tomcat-docs"/>
-                    <delete dir="${org.apache.jetspeed.portal.home}/webapps/webdav"/>
+                    <delete dir="${org.apache.jetspeed.portal.home}/webapps/examples"/>
+                    <delete dir="${org.apache.jetspeed.portal.home}/webapps/docs"/>
                   </tasks>
                 </configuration>
                 <goals>
@@ -145,6 +144,7 @@
                 <configuration>
                   <targetBaseDir>${org.apache.jetspeed.portal.home}</targetBaseDir>
                   <portalName>${org.apache.jetspeed.portal.context.name}</portalName>
+                  <profile>tomcat${tomcat.version.major}</profile>
                   <destinations>
                     <context>webapps/jetspeed/META-INF</context>
                   </destinations>
@@ -310,6 +310,7 @@
                 <configuration>
                   <targetBaseDir>${org.apache.jetspeed.portal.home}</targetBaseDir>
                   <portalName>${org.apache.jetspeed.portal.context.name}</portalName>
+                  <profile>tomcat${tomcat.version.major}</profile>
                   <destinations>
                     <context>webapps/jetspeed/META-INF</context>
                   </destinations>

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-installer/zip-tomcat-portal-descriptor.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-installer/zip-tomcat-portal-descriptor.xml?rev=746641&r1=746640&r2=746641&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-installer/zip-tomcat-portal-descriptor.xml
(original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-installer/zip-tomcat-portal-descriptor.xml
Sun Feb 22 06:06:20 2009
@@ -27,7 +27,7 @@
   </formats>
   <fileSets>
     <fileSet>
-      <directory>target/${tomcat.version}</directory>
+      <directory>target/${tomcat.name}</directory>
       <outputDirectory>/</outputDirectory>
     </fileSet>
   </fileSets>

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/ddl-schema/registry-schema.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/ddl-schema/registry-schema.xml?rev=746641&r1=746640&r2=746641&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/ddl-schema/registry-schema.xml
(original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/ddl-schema/registry-schema.xml
Sun Feb 22 06:06:20 2009
@@ -27,10 +27,11 @@
         <column name="NAME" size="80" type="VARCHAR"/>
         <column name="CLASS_NAME" size="255" type="VARCHAR"/>
         <column name="APPLICATION_ID" required="true" type="INTEGER"/>
-        <column name="EXPIRATION_CACHE" size="30" type="VARCHAR"/>
+        <column name="EXPIRATION_CACHE" type="INTEGER"/>
         <column name="RESOURCE_BUNDLE" size="255" type="VARCHAR"/>
         <column name="PREFERENCE_VALIDATOR" size="255" type="VARCHAR"/>
-        <column name="SECURITY_REF" size="40" type="VARCHAR"/>        
+        <column name="SECURITY_REF" size="40" type="VARCHAR"/>      
+        <column name="CACHE_SCOPE" size="30" type="VARCHAR"/>  
         <column name="JPA_VERSION" type="INTEGER"/>
     </table>
 
@@ -46,6 +47,7 @@
         <column name="APP_TYPE" type="INTEGER"/>
 		<column name="CHECKSUM" size="80" type="VARCHAR"/>
         <column name="SECURITY_REF" size="40" type="VARCHAR"/>
+        <column name="DEFAULT_NAMESPACE" size="120" type="VARCHAR"/>
         <column name="JPA_VERSION" type="INTEGER"/>
         <unique name="UK_APPLICATION">
             <unique-column name="APP_NAME"/>
@@ -294,5 +296,110 @@
             <reference foreign="APPLICATION_ID" local="APPLICATION_ID"/>
         </foreign-key>        
     </table>
-                         
+
+    <!-- 
+	    EVENT DEFINITION       
+    -->
+    <table name="EVENT_DEFINITION">
+    	<column name="ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="APPLICATION_ID" required="true" type="INTEGER"/>  
+        <column name="LOCAL_PART" required="true" size="80" type="VARCHAR"/>
+        <column name="NAMESPACE" required="false" size="80" type="VARCHAR"/>
+        <column name="PREFIX" required="false" size="20" type="VARCHAR"/>        
+        <column name="VALUE_TYPE" required="true" size="120" type="VARCHAR"/>
+        <column name="JPA_VERSION" type="INTEGER"/>
+        <foreign-key foreignTable="PORTLET_APPLICATION" name="FK_EVENT_DEFINITION_1" onDelete="cascade">
                       
+            <reference foreign="APPLICATION_ID" local="APPLICATION_ID"/>          
 
+        </foreign-key>    	
+    </table>             
+
+    <!-- 
+	    EVENT ALIAS       
+    -->
+    <table name="EVENT_ALIAS">
+        <column name="ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="OWNER_ID" required="true" type="INTEGER"/>
+        <column name="LOCAL_PART" required="true" size="80" type="VARCHAR"/>
+        <column name="NAMESPACE" required="false" size="80" type="VARCHAR"/>
+        <column name="PREFIX" required="false" size="20" type="VARCHAR"/>        
+        <column name="JPA_VERSION" type="INTEGER"/>
+    </table>
+
+    <!-- 
+	    PUBLIC RENDER PARAM ALIAS       
+    -->
+    <table name="PARAMETER_ALIAS">
+        <column name="ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="OWNER_ID" required="true" type="INTEGER"/>
+        <column name="LOCAL_PART" required="true" size="80" type="VARCHAR"/>
+        <column name="NAMESPACE" required="false" size="80" type="VARCHAR"/>
+        <column name="PREFIX" required="false" size="20" type="VARCHAR"/>        
+        <column name="JPA_VERSION" type="INTEGER"/>
+    </table>
+
+    <!-- 
+	    PUBLISHING EVENT       
+    -->
+    <table name="PUBLISHING_EVENT">
+        <column name="ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="OWNER_ID" required="true" type="INTEGER"/>
+        <column name="LOCAL_PART" required="true" size="80" type="VARCHAR"/>
+        <column name="NAMESPACE" required="false" size="80" type="VARCHAR"/>
+        <column name="PREFIX" required="false" size="20" type="VARCHAR"/>        
+        <column name="JPA_VERSION" type="INTEGER"/>
+    </table>
+
+    <!-- 
+	    PROCESSING EVENT
+    -->
+    <table name="PROCESSING_EVENT">
+        <column name="ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="OWNER_ID" required="true" type="INTEGER"/>
+        <column name="LOCAL_PART" required="true" size="80" type="VARCHAR"/>
+        <column name="NAMESPACE" required="false" size="80" type="VARCHAR"/>
+        <column name="PREFIX" required="false" size="20" type="VARCHAR"/>        
+        <column name="JPA_VERSION" type="INTEGER"/>
+    </table>
+    
+   <!--                                                                   
+	   SUPPORTED RENDER PARAMETERS                                                        
+    -->                                                                     
+    <table name="NAMED_PARAMETER">                                            
+        <column name="ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="OWNER_ID" required="true" type="INTEGER"/>
+        <column name="NAME" required="true" size="150" type="VARCHAR"/>
+        <column name="JPA_VERSION" type="INTEGER"/>
+    </table> 
+       
+   <!--                                                                   
+	   RUNTIME OPTIONS                                                        
+    -->                                                                     
+    <table name="RUNTIME_OPTION">                                            
+        <column name="ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="OWNER_ID" required="true" type="INTEGER"/>
+        <column name="OWNER_CLASS_NAME" required="true" size="255" type="VARCHAR"/>
+        <column name="NAME" required="true" size="150" type="VARCHAR"/>
+        <column name="JPA_VERSION" type="INTEGER"/>
+    </table> 
+    
+    <table name="RUNTIME_VALUE">                                            
+        <column name="ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="OWNER_ID" required="true" type="INTEGER"/>
+        <column name="RVALUE" required="true" size="200" type="VARCHAR"/>
+        <column name="JPA_VERSION" type="INTEGER"/>
+    </table> 
+
+   <!--                                                                   
+	   PUBLIC RENDER PARAMETERS                                                        
+    -->                                                                     
+    <table name="PUBLIC_PARAMETER">                                            
+        <column name="ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="APPLICATION_ID" required="true" type="INTEGER"/>  
+        <column name="LOCAL_PART" required="true" size="80" type="VARCHAR"/>
+        <column name="NAMESPACE" required="false" size="80" type="VARCHAR"/>
+        <column name="PREFIX" required="false" size="20" type="VARCHAR"/>        
+        <column name="IDENTIFIER" required="true" size="150" type="VARCHAR"/>
+        <column name="JPA_VERSION" type="INTEGER"/>
+    </table> 
+                   
 </database>

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml?rev=746641&r1=746640&r2=746641&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml
(original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml
Sun Feb 22 06:06:20 2009
@@ -71,15 +71,15 @@
 <!--   <constructor-arg><ref bean="org.apache.pluto.services.PortletURLProviderImpl"/></constructor-arg>
(currently doing a 'new')
        <constructor-arg><ref bean="org.apache.pluto.services.ResourceURLProviderImpl"/></constructor-arg>
(currently doing a 'new')
 -->
-		<constructor-arg><ref bean="org.apache.pluto.services.RequestPropertyProvider"/></constructor-arg>
-		<constructor-arg><ref bean="org.apache.pluto.services.EventProvider"/></constructor-arg>
+		<constructor-arg><ref bean="org.apache.pluto.services.PropertyManager"/></constructor-arg>
 		<constructor-arg><ref bean="org.apache.pluto.services.FilterManager"/></constructor-arg>
 		<constructor-arg><ref bean="org.apache.pluto.services.PortletURLListener"/></constructor-arg>
+		<constructor-arg><ref bean="org.apache.jetspeed.container.window.PortletWindowAccessor"/></constructor-arg>
	
     </bean>
 
 
-	<bean id='org.apache.pluto.services.RequestPropertyProvider'
-		  class="org.apache.jetspeed.container.providers.RequestPropertyProviderImpl">
+	<bean id='org.apache.pluto.services.PropertyManager'
+		  class="org.apache.pluto.core.DefaultPropertyManager">
       <meta key="j2:cat" value="default" />		  
 	</bean>
 	

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/maven/jetspeed-deploy-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DeployMojo.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/maven/jetspeed-deploy-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DeployMojo.java?rev=746641&r1=746640&r2=746641&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/maven/jetspeed-deploy-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DeployMojo.java
(original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/maven/jetspeed-deploy-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DeployMojo.java
Sun Feb 22 06:06:20 2009
@@ -54,6 +54,10 @@
 {
     private static final String DEPLOY_FACTORY_CLASS_NAME = "org.apache.jetspeed.tools.deploy.JetspeedDeployFactory";
 
+    private static final String PROFILE_TOMCAT5 = "tomcat5"; 
+    private static final String PROFILE_TOMCAT6 = "tomcat6"; 
+    private static final String DEFAULT_PROFILE = PROFILE_TOMCAT5; 
+
     public static class Deployment
     {
         private String artifact;
@@ -123,6 +127,11 @@
     /** @parameter expression="${plugin.introducedDependencyArtifacts}" */
     private Set pluginDependencyArtifacts;
     
+    /**
+     * @parameter
+     */
+    private String profile;
+
     private Artifacts artifacts;
     
     /* (non-Javadoc)
@@ -135,27 +144,8 @@
         {
             destMap.putAll(destinations);
         }
-        // init default for tomcat5.5
-        if (!destMap.containsKey("system"))
-        {
-            destMap.put("system","common/endorsed");
-        }
-        if (!destMap.containsKey("lib"))
-        {
-            destMap.put("lib","shared/lib");
-        }
-        if (!destMap.containsKey("war"))
-        {
-            destMap.put("war", "webapps");
-        }
-        if (!destMap.containsKey("deploy"))
-        {
-            destMap.put("deploy", ((String)destMap.get("war"))+"/"+portalName+"/WEB-INF/deploy");
-        }
-        if (!destMap.containsKey("local"))
-        {
-            destMap.put("local", ((String)destMap.get("deploy"))+"/local");
-        }
+
+       	initDefaultDestinations(destMap, (profile != null) ? profile : DEFAULT_PROFILE);
         
         File targetBaseDir = new File(this.targetBaseDir);
         if (targetBaseDir.exists() && targetBaseDir.isFile())
@@ -476,8 +466,8 @@
             }
         }
     }
-    
-    private static String getValue(String value, String defaultValue)
+
+	private static String getValue(String value, String defaultValue)
     {
         return value != null ? value : defaultValue;
     }
@@ -653,4 +643,62 @@
             }
         }
     }
-}
+    
+    /**
+     * Initialize default destinations for a certain profile.
+     */
+    private void initDefaultDestinations(Map destMap, String profile) throws MojoFailureException
{
+
+    	if (!(profile.equals(PROFILE_TOMCAT5) || profile.equals(PROFILE_TOMCAT6))) {
+    		throw new MojoFailureException("Cannot handle profile '" + profile + "', use '" 
+    				+ PROFILE_TOMCAT5 + "' or '" + PROFILE_TOMCAT6 + "'");
+    	}
+    	
+    	if (profile.equals(PROFILE_TOMCAT5)) {
+    		
+	        if (!destMap.containsKey("system"))
+	        {
+	            destMap.put("system","common/endorsed");
+	        }
+	        if (!destMap.containsKey("lib"))
+	        {
+	            destMap.put("lib","shared/lib");
+	        }
+	        if (!destMap.containsKey("war"))
+	        {
+	            destMap.put("war", "webapps");
+	        }
+	        if (!destMap.containsKey("deploy"))
+	        {
+	            destMap.put("deploy", ((String)destMap.get("war"))+"/"+portalName+"/WEB-INF/deploy");
+	        }
+	        if (!destMap.containsKey("local"))
+	        {
+	            destMap.put("local", ((String)destMap.get("deploy"))+"/local");
+	        }
+    	}
+    	else if (profile.equals(PROFILE_TOMCAT6)) {
+
+    		if (!destMap.containsKey("system"))
+            {
+                destMap.put("system","lib");
+            }
+            if (!destMap.containsKey("lib"))
+            {
+                destMap.put("lib","lib");
+            }
+            if (!destMap.containsKey("war"))
+            {
+                destMap.put("war", "webapps");
+            }
+            if (!destMap.containsKey("deploy"))
+            {
+                destMap.put("deploy", ((String)destMap.get("war"))+"/"+portalName+"/WEB-INF/deploy");
+            }
+            if (!destMap.containsKey("local"))
+            {
+                destMap.put("local", ((String)destMap.get("deploy"))+"/local");
+            }
+    	}
+    }
+}	



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


Mime
View raw message