You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2007/01/15 22:46:10 UTC

svn commit: r496506 - in /portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources: ./ etc/dbpsml/ etc/dbpsml/assembly/ etc/dbpsml/assembly/alternate/

Author: taylor
Date: Mon Jan 15 13:46:09 2007
New Revision: 496506

URL: http://svn.apache.org/viewvc?view=rev&rev=496506
Log:
DBPSML support in custom M2 builds via the "dbpsml" profile (-P dbpsml)
contribution from Hajo Birthelmer

Added:
    portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/
    portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/
    portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/alternate/
    portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/alternate/db-page-manager.xml
    portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/alternate/extended-pipelines.xml
    portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/alternate/interceptors.xml
    portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/import-page-manager.xml
    portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/repository-datasource-spring.xml
    portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/build.xml
    portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/export.properties
    portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/import.properties
    portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/pom.xml
Modified:
    portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml

Added: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/alternate/db-page-manager.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/alternate/db-page-manager.xml?view=auto&rev=496506
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/alternate/db-page-manager.xml (added)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/alternate/db-page-manager.xml Mon Jan 15 13:46:09 2007
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+Copyright 2006 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
+
+    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.
+-->
+<beans>
+    
+  <!-- DB PageManager -->
+  <bean id="org.apache.jetspeed.page.PageManagerImpl" 
+        name="pageManagerImpl"
+        init-method="init"
+        class="org.apache.jetspeed.page.impl.DatabasePageManager">
+      <!-- OJB configuration file resource path -->
+      <constructor-arg index="0"><value>JETSPEED-INF/ojb/page-manager-repository.xml</value></constructor-arg>       
+      <!-- folder/page/link cache size, default=128, min=128 -->
+      <constructor-arg index="1"><value>128</value></constructor-arg>
+      <!-- folder/page/link cache expires seconds, default=-1, infinite=0, min=30 -->
+      <!--                                         (default is 150 seconds) -->
+      <constructor-arg index="2"><value>-1</value></constructor-arg>
+      <!-- permissions security enabled flag, default=false -->
+      <constructor-arg index="3"><value>false</value></constructor-arg>
+      <!-- constraints security enabled flag, default=true -->
+      <constructor-arg index="4"><value>true</value></constructor-arg>
+  </bean>
+
+  <!-- Transaction Proxying -->
+  <bean id="org.apache.jetspeed.page.PageManager" name="pageManager" parent="PageManagerTransactionProxy">
+      <property name="proxyInterfaces">
+          <value>org.apache.jetspeed.page.PageManager</value>
+      </property>
+      <property name="target">
+          <ref bean="pageManagerImpl" />
+      </property>
+      <property name="transactionAttributes">
+          <props>
+              <prop key="*">PROPAGATION_SUPPORTS</prop>
+              <prop key="get*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+              <prop key="update*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+              <prop key="remove*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+              <prop key="create*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+              <prop key="deepCopy*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+              <prop key="add*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+              <prop key="folderExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+              <prop key="pageExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+              <prop key="linkExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+              <prop key="userFolderExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+              <prop key="userPageExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+          </props>
+      </property>
+  </bean>
+
+  <!-- Inject Page Manager Proxy into Page Manager -->
+  <bean id="injectPageManagerProxy" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+      <property name="targetObject"><ref bean="pageManagerImpl"/></property>
+      <property name="targetMethod"><value>setPageManagerProxy</value></property>
+      <property name="arguments">
+          <list>
+              <ref bean="pageManager"/>
+          </list>
+      </property>
+  </bean>
+
+  <!-- PortalSite -->
+  <bean id="org.apache.jetspeed.portalsite.PortalSite" 
+       name="portalSite"
+       class="org.apache.jetspeed.portalsite.impl.PortalSiteImpl">         
+       <constructor-arg index="0"><ref bean="pageManager"/></constructor-arg>
+  </bean>
+
+</beans>

Added: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/alternate/extended-pipelines.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/alternate/extended-pipelines.xml?view=auto&rev=496506
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/alternate/extended-pipelines.xml (added)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/alternate/extended-pipelines.xml Mon Jan 15 13:46:09 2007
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+Copyright 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
+
+    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.
+-->
+
+<!-- the three beans below are examples only -->
+<beans>
+  <bean id="propertyLoaderValve_1"
+        class="com.fmr.portal.pipeline.impl.PropertyLoaderValve"
+        init-method="initialize"> 
+      <constructor-arg index="0"> 
+          <value>php-properties</value>
+      </constructor-arg> 
+      <constructor-arg index="1"
+       type="org.apache.commons.configuration.PropertiesConfiguration"> 
+          <ref bean="ProductionConfiguration"/> 
+      </constructor-arg> 
+  </bean>
+  
+  <bean id="propertyLoaderValve_2"
+        class="com.fmr.portal.pipeline.impl.PropertyLoaderValve"
+        init-method="initialize"> 
+      <constructor-arg index="0"> 
+          <value>php-properties</value>
+      </constructor-arg>  
+      <constructor-arg index="1">
+          <value>/apps/jetspeed/etc/jetspeed-production.properties</value>
+      </constructor-arg> 
+  </bean>
+  
+  <bean id="propertyLoaderValve_3"
+        class="com.fmr.portal.pipeline.impl.PropertyLoaderValve"
+         init-method="initialize"> 
+      <constructor-arg index="0"> 
+          <value>app.props</value>
+      </constructor-arg> 
+  </bean>
+    
+</beans>

Added: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/alternate/interceptors.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/alternate/interceptors.xml?view=auto&rev=496506
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/alternate/interceptors.xml (added)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/alternate/interceptors.xml Mon Jan 15 13:46:09 2007
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+    Database PSML Manager Interception for handling Cache Rollback
+    We also have examples here of replay interception for failover to 
+    a second database on update failures
+   -->    
+<beans>
+
+    <bean id="pageManagerInterceptor" class="org.apache.jetspeed.util.interceptors.PageManagerInterceptor">
+    </bean>
+
+
+    <bean id="PageManagerTransactionProxy" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean"
+                        abstract="true">
+        <property name="transactionManager"><ref bean="transactionManager"/></property>
+        <property name="transactionAttributes">
+            <props>
+                <prop key="*">PROPAGATION_REQUIRED</prop>
+            </props>
+        </property>
+        <property name="preInterceptors"> 
+            <list>
+                <ref local="pageManagerInterceptor" />
+            </list>
+        </property>
+    </bean>
+
+    <!--    
+        Replay support:
+        
+    <bean id="replayTransactionProxy" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean"
+                        abstract="true">
+        <property name="transactionManager"><ref bean="transactionManager"/></property>
+        <property name="transactionAttributes">
+            <props>
+                <prop key="*">PROPAGATION_REQUIRED</prop>
+            </props>
+        </property>
+        <property name="preInterceptors"> 
+            <list>
+                <ref local="methodReplayInterceptor" />
+            </list>
+        </property>
+    </bean>
+        
+   <bean id="replayDecisionMakerBean"
+        class="org.apache.jetspeed.util.interceptors.TransactionalMethodReplayDecisionMaker">
+        <property name="sqlErrorCodes">
+            <value>9999, 400, -80</value> 
+             <value>9999</value>
+        </property>
+    </bean>
+
+    <bean id="methodReplayInterceptor" class="org.apache.jetspeed.util.interceptors.MethodReplayInterceptor">
+        <property name="retryCount">
+            <value>3</value>
+        </property>
+        <property name="retryInterval">
+            <value>500</value></property>  retry every 500 milliseconds 
+        <property name="replayDecisionMaker">
+            <ref bean="replayDecisionMakerBean"/>
+        </property>
+    </bean>
+ -->
+            
+</beans>

Added: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/import-page-manager.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/import-page-manager.xml?view=auto&rev=496506
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/import-page-manager.xml (added)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/import-page-manager.xml Mon Jan 15 13:46:09 2007
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+Copyright 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
+
+    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.
+-->
+<beans>
+
+  <bean id="org.apache.jetspeed.page.PageManagerImpl" 
+        name="pageManagerImpl"
+        init-method="init"
+        class="org.apache.jetspeed.page.impl.DatabasePageManager">
+      <!-- OJB configuration file resource path -->
+      <constructor-arg index="0"><value>JETSPEED-INF/ojb/page-manager-repository.xml</value></constructor-arg>       
+      <!-- folder/page/link cache size, default=128, min=128 -->
+      <constructor-arg index="1"><value>128</value></constructor-arg>
+      <!-- folder/page/link cache expires seconds, default=150, infinite=0, min=30 -->
+      <constructor-arg index="2"><value>0</value></constructor-arg>
+      <!-- permissions security enabled flag, default=false -->
+      <constructor-arg index="3"><value>false</value></constructor-arg>
+      <!-- constraints security enabled flag, default=true -->
+      <constructor-arg index="4"><value>false</value></constructor-arg>
+  </bean>
+
+    <!-- Proxying -->
+    <bean id="org.apache.jetspeed.page.PageManager" name="dbPageManager" parent="PageManagerTransactionProxy">
+        <property name="proxyInterfaces">
+            <value>org.apache.jetspeed.page.PageManager</value>
+        </property>
+        <property name="target">
+            <ref bean="pageManagerImpl" />
+        </property>
+        <property name="transactionAttributes">
+            <props>
+                <prop key="*">PROPAGATION_SUPPORTS</prop>
+                <prop key="get*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+                <prop key="update*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+                <prop key="remove*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+                <prop key="create*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+                <prop key="deepCopy*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+                <prop key="add*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+                <prop key="folderExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+                <prop key="pageExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+                <prop key="linkExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+                <prop key="userFolderExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+                <prop key="userPageExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+            </props>
+        </property>
+    </bean>
+
+    <!-- Inject Page Manager Proxy into Page Manager -->
+    <bean id="injectPageManagerProxy" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+        <property name="targetObject"><ref bean="pageManagerImpl"/></property>
+        <property name="targetMethod"><value>setPageManagerProxy</value></property>
+        <property name="arguments">
+            <list>
+                <ref bean="dbPageManager"/>
+            </list>
+        </property>
+    </bean>
+
+  <!-- PageManager -->
+  <bean id="PsmlDocumentHandler"      
+       class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler" >         
+       <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
+       <constructor-arg index="1"><value>.psml</value></constructor-arg>
+       <constructor-arg index="2" ><value>org.apache.jetspeed.om.page.psml.PageImpl</value></constructor-arg>       
+       <constructor-arg index="3" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
+       <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
+  </bean>
+  
+  <bean id="LinkDocumentHandler"       
+       class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler" >         
+       <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
+       <constructor-arg index="1"><value>.link</value></constructor-arg>
+       <constructor-arg index="2" ><value>org.apache.jetspeed.om.page.psml.LinkImpl</value></constructor-arg>       
+       <constructor-arg index="3" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
+       <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
+  </bean>
+  
+  <bean id="FolderMetaDataDocumentHandler"         
+       class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler" >         
+       <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
+       <constructor-arg index="1"><value>folder.metadata</value></constructor-arg>
+       <constructor-arg index="2" ><value>org.apache.jetspeed.om.folder.psml.FolderMetaDataImpl</value></constructor-arg>       
+       <constructor-arg index="3" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
+       <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
+  </bean>
+  
+  <bean id="PageSecurityDocumentHandler"       
+       class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler" >         
+       <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
+       <constructor-arg index="1"><value>page.security</value></constructor-arg>
+       <constructor-arg index="2" ><value>org.apache.jetspeed.om.page.psml.PageSecurityImpl</value></constructor-arg>       
+       <constructor-arg index="3" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
+       <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
+  </bean>
+  
+  <bean id="DocumentHandlerFactory"        
+       class="org.apache.jetspeed.page.document.psml.DocumentHandlerFactoryImpl" >      
+        <constructor-arg>
+        <map>
+          <entry key=".psml">
+            <ref bean="PsmlDocumentHandler" />
+          </entry>
+          <entry key=".link">
+            <ref bean="LinkDocumentHandler" />
+          </entry>  
+          <entry key="folder.metadata">
+            <ref bean="FolderMetaDataDocumentHandler" />
+          </entry>        
+          <entry key="page.security">
+            <ref bean="PageSecurityDocumentHandler" />
+          </entry>        
+        </map>
+       </constructor-arg>
+  </bean>
+  
+  <bean id="FolderHandler"         
+       class="org.apache.jetspeed.page.document.psml.FileSystemFolderHandler" >         
+       <constructor-arg index="0"><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
+       <constructor-arg index="1"><ref bean="DocumentHandlerFactory"/></constructor-arg>
+       <constructor-arg index="2"><ref bean="PageFileCache"/></constructor-arg>        
+  </bean>
+    
+  <bean id="org.apache.jetspeed.page.CastorPageManager" 
+       name="castorPageManager"
+       class="org.apache.jetspeed.page.psml.CastorXmlPageManager">         
+       <constructor-arg index="0"><ref bean="IdGenerator"/></constructor-arg>
+       <constructor-arg index="1"><ref bean="DocumentHandlerFactory"/></constructor-arg>
+       <constructor-arg index="2"><ref bean="FolderHandler"/></constructor-arg>
+       <constructor-arg index="3"><ref bean="PageFileCache"/></constructor-arg>        
+       <!-- permissions security enabled flag, default=false -->
+       <constructor-arg index="4"><value>false</value></constructor-arg>
+       <!-- constraints security enabled flag, default=true -->
+       <constructor-arg index="5"><value>false</value></constructor-arg>
+  </bean>
+
+    <!-- Page File Cache -->
+    <bean id="PageFileCache" class="org.apache.jetspeed.cache.file.FileCache" init-method="startFileScanner" destroy-method="stopFileScanner">
+        <!-- Scan rate for changes in cached files on the file system -->
+        <constructor-arg index="0">
+            <value>10</value>
+        </constructor-arg>
+        <!-- Cache size -->
+        <constructor-arg index="1">
+            <value>100</value>
+        </constructor-arg>
+    </bean>
+
+    <bean id="IdGenerator" class="org.apache.jetspeed.idgenerator.JetspeedIdGenerator" init-method="start" destroy-method="stop">
+        <!-- ID Start value -->
+        <constructor-arg index="0">
+            <value>65536</value>
+        </constructor-arg>
+        <!-- ID Prefix -->
+        <constructor-arg index="1">
+            <value>P-</value>
+        </constructor-arg>
+        <!-- ID Suffix -->
+        <constructor-arg index="2">
+            <value></value>
+        </constructor-arg>
+    </bean>
+
+
+    <!-- properties configurer used to pick up system properties -->
+    <bean id="propertiesConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
+</beans>

Added: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/repository-datasource-spring.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/repository-datasource-spring.xml?view=auto&rev=496506
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/repository-datasource-spring.xml (added)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/repository-datasource-spring.xml Mon Jan 15 13:46:09 2007
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans>		
+
+  <!-- datasource bean -->
+<!--  <bean id="JetspeedDS" class="org.apache.jetspeed.components.rdbms.ojb.ConnectionRepositoryEntry"> -->
+  <bean id="JetspeedDS" class="org.apache.commons.dbcp.BasicDataSource">     
+    <property name="driverClassName">
+      <value>${org.apache.jetspeed.database.driver}</value>
+    </property>
+    <property name="url">
+      <value>${org.apache.jetspeed.database.url}</value>
+    </property>
+    <property name="username">
+      <value>${org.apache.jetspeed.database.user}</value>
+    </property>
+    <property name="password">
+      <value>${org.apache.jetspeed.database.password}</value>
+    </property>
+  </bean>     
+    
+  <bean id="ojbConfigurer" class="org.springmodules.orm.ojb.support.LocalOjbConfigurer"/> 
+     
+    <!-- 
+         Dynamically configures Database Platform for OJB by looking at the connection string
+         and figuring out the OJB platform using an OJB metadata utility
+         Its important to get this right otherwise you will be sending the wrong (most likely HSQL)
+         flavor of SQL statements to the backend database.
+     -->
+     <bean id="PlatformConfigurator" 
+           class="org.apache.jetspeed.components.rdbms.ojb.DatabasePlatformConfigurator"
+           init-method="init"
+      >
+    	<constructor-arg index='0'>
+    		<ref bean="JetspeedDS"/>
+    	</constructor-arg>         
+        <!-- JNDI Name -->
+    	<constructor-arg index='1'>
+    		<value>JetspeedDS</value>
+    	</constructor-arg>                  
+     </bean>
+    
+  <!-- properties configurer used to pick up system properties -->
+  <bean id="propertiesConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
+</beans>

Added: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/build.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/build.xml?view=auto&rev=496506
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/build.xml (added)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/build.xml Mon Jan 15 13:46:09 2007
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2006 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
+
+    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:$
+-->
+<project name="etc" default="help">
+
+    <!-- Properties -->
+
+    <property name="org.apache.jetspeed.database.enable" value="true"/>
+    <property name="org.apache.jetspeed.database.skip" value="false"/>
+    <property name="org.apache.jetspeed.database.psml" value="false"/>
+    <property name="org.apache.jetspeed.deploy.type" value="full"/>
+    <property name="org.apache.jetspeed.database.default.name" value=""/>
+    <property name="org.apache.jetspeed.database.url" value=""/>
+    <property name="org.apache.jetspeed.database.jdbc.drivers.path" value=""/>
+    <property name="org.apache.jetspeed.database.driver" value=""/>
+    <property name="org.apache.jetspeed.database.user" value=""/>
+    <property name="org.apache.jetspeed.database.password" value=""/>
+    <property name="org.apache.derby.version" value=""/>
+    <property name="hsqldb.version" value=""/>
+    <property name="org.apache.jetspeed.groupid" value=""/>
+    <property name="org.apache.jetspeed.version" value=""/>
+    <property name="org.apache.pluto.version" value=""/>
+    <property name="portlet-api.version" value=""/>
+
+	<property name="org.apache.jetspeed.page.import.configuration" value="${basedir}/import.properties"/>
+	<property name="org.apache.jetspeed.page.import.pages" value="${basedir}/target/data/pages"/>
+
+    <!-- Usage -->
+
+    <target name="help">
+        <echo message="Buildfile for the import maven POM."/>
+        <echo message="Usage: ant [ populate-db-psml ]"/>
+        <echo message="Where:"/>
+        <echo message="    populate-db-psml - build and populate database instance with imported PSML."/>
+        <echo message="Configuration:"/>
+        <echo message="    org.apache.jetspeed.database.enable=${org.apache.jetspeed.database.enable}"/>
+        <echo message="    org.apache.jetspeed.database.skip=${org.apache.jetspeed.database.skip}"/>
+        <echo message="    org.apache.jetspeed.database.psml=${org.apache.jetspeed.database.psml}"/>
+        <echo message="    org.apache.jetspeed.deploy.type=${org.apache.jetspeed.deploy.type}"/>
+        <echo message="    org.apache.jetspeed.database.default.name=${org.apache.jetspeed.database.default.name}"/>
+        <echo message="    org.apache.jetspeed.database.url=${org.apache.jetspeed.database.url}"/>
+        <echo message="    org.apache.jetspeed.database.jdbc.drivers.path=${org.apache.jetspeed.database.jdbc.drivers.path}"/>
+        <echo message="    org.apache.jetspeed.database.driver=${org.apache.jetspeed.database.driver}"/>
+        <echo message="    org.apache.jetspeed.database.user=${org.apache.jetspeed.database.user}"/>
+        <echo message="    org.apache.jetspeed.database.password=${org.apache.jetspeed.database.password}"/>
+        <echo message="    org.apache.derby.version=${org.apache.derby.version}"/>
+        <echo message="    hsqldb.version=${hsqldb.version}"/>
+        <echo message="    org.apache.jetspeed.groupid=${org.apache.jetspeed.groupid}"/>
+        <echo message="    org.apache.jetspeed.version=${org.apache.jetspeed.version}"/>
+        <echo message="    org.apache.pluto.version=${org.apache.pluto.version}"/>
+        <echo message="    portlet-api.version=${portlet-api.version}"/>
+    </target>
+
+    <!-- Additional Task Definitions -->
+
+    <taskdef resource="org/apache/maven/artifact/ant/antlib.xml"/>
+
+    <!-- Populate Database -->
+
+    <target name="populate-db-psml" depends="test-populate-skip" unless="org.apache.jetspeed.skip.psml">
+
+        <!-- aggregate PSML to merge -->
+        <delete dir="${basedir}/target/data/pages"/>
+        <mkdir dir="${basedir}/target/data/pages"/>
+        <antcall target="aggregate-pages"/>
+
+        <!-- prepare a classes directory with resources and libraries to execute import -->
+        <delete dir="${basedir}/target/classes"/>
+        <mkdir dir="${basedir}/target/classes"/>
+        <copy todir="${basedir}/target/classes" flatten="on">
+            <fileset dir="${basedir}/../.." >
+                <include name="etc/log4j/log4j.properties"/>
+                <include name="etc/db-ojb/*"/>
+                <include name="etc/import/assembly/import-page-manager.xml"/>
+                <include name="etc/import/assembly/repository-datasource-spring.xml"/>
+                <include name="src/webapp/WEB-INF/assembly/transaction.xml"/>
+                <include name="src/webapp/WEB-INF/assembly/alternate/interceptors.xml"/>
+            </fileset>
+        </copy>
+
+        <!-- construct page manager component classpath -->
+        <dependencies filesetId="page.manager.dependencies.id" useScope="test">
+            <dependency groupId="${org.apache.jetspeed.groupid}"
+                        artifactId="jetspeed-api"
+                        version="${org.apache.jetspeed.version}"/>
+            <dependency groupId="${org.apache.jetspeed.groupid}"
+                        artifactId="jetspeed-commons"
+                        version="${org.apache.jetspeed.version}"/>
+            <dependency groupId="org.apache.pluto"
+                        artifactId="pluto"
+                        version="${org.apache.pluto.version}"/>
+            <dependency groupId="${org.apache.jetspeed.groupid}"
+                        artifactId="jetspeed-id-generator"
+                        version="${org.apache.jetspeed.version}"/>
+            <dependency groupId="portlet-api"
+                        artifactId="portlet-api"
+                        version="${portlet-api.version}"/>
+            <dependency groupId="${org.apache.jetspeed.groupid}"
+                        artifactId="jetspeed-page-manager"
+                        version="${org.apache.jetspeed.version}"/>
+        </dependencies>
+
+        <!-- create sysproperty set to configure import utility -->
+        <propertyset id="import.syspropertyset.id">
+		    <propertyref name="org.apache.jetspeed.page.import.configuration"/>
+		    <propertyref name="org.apache.jetspeed.page.import.pages"/>
+            <propertyref name="org.apache.jetspeed.database.driver"/>
+            <propertyref name="org.apache.jetspeed.database.url"/>
+            <propertyref name="org.apache.jetspeed.database.user"/>
+            <propertyref name="org.apache.jetspeed.database.password"/>
+        </propertyset>
+
+        <!-- execute import utility within the page manager component -->
+        <antcall target="execute-import" inheritall="on" inheritrefs="on"/>
+    </target>
+
+    <target name="aggregate-pages" depends="test-deploy-type, aggregate-pages-min, aggregate-pages-full"/>
+
+    <target name="aggregate-pages-min" if="org.apache.jetspeed.deploy.min">
+        <copy todir="${basedir}/target/data/pages">
+            <fileset dir="${basedir}/../../src/webapp/WEB-INF/pages">
+                <include name="Administrative/**"/>
+                <include name="my-account.psml"/>
+                <include name="page.security"/>
+                <include name="system/**"/>
+            </fileset>
+        </copy>
+        <copy file="${basedir}/../../src/webapp/WEB-INF/pages/minimal-default-page.psml"
+              tofile="${basedir}/target/data/pages/default-page.psml"/>
+        <replace file="${basedir}/target/data/pages/default-page.psml"
+                 token=" hidden=&quot;true&quot;"/>
+    </target>
+
+    <target name="aggregate-pages-full" if="org.apache.jetspeed.deploy.full">
+        <copy todir="${basedir}/target/data/pages">
+            <fileset dir="${basedir}/../../src/webapp/WEB-INF/pages"/>
+        </copy>
+    </target>
+
+    <target name="execute-import" depends="test-database-classpath, execute-import-drivers-path, execute-import-derby, execute-import-hsql"/>
+
+    <target name="execute-import-drivers-path" if="org.apache.jetspeed.database.use.drivers.path">
+
+        <!-- execute import utility with drivers path in classpath -->
+        <java classname="org.apache.jetspeed.page.PageImporter" fork="yes" dir="${basedir}">
+            <classpath>
+                <fileset refid="page.manager.dependencies.id"/>
+                <pathelement path="${org.apache.jetspeed.database.jdbc.drivers.path}"/>
+                <pathelement path="${basedir}/target/classes"/>
+            </classpath>
+		    <syspropertyset>
+                <propertyset refid="import.syspropertyset.id"/>
+		    </syspropertyset>
+        </java>
+
+    </target>
+
+    <target name="execute-import-derby" if="org.apache.jetspeed.database.is.derby.embedded">
+
+        <!-- construct embedded derby classpath -->
+        <dependencies filesetId="derby.embedded.db.dependencies.id" useScope="test">
+            <dependency groupId="org.apache.derby"
+                        artifactId="derby"
+                        version="${org.apache.derby.version}"/>
+        </dependencies>
+
+        <!-- execute import utility with drivers path in classpath -->
+        <java classname="org.apache.jetspeed.page.PageImporter" fork="yes" dir="${basedir}">
+            <classpath>
+                <fileset refid="page.manager.dependencies.id"/>
+                <fileset refid="derby.embedded.db.dependencies.id"/>
+                <pathelement path="${basedir}/target/classes"/>
+            </classpath>
+		    <syspropertyset>
+                <propertyset refid="import.syspropertyset.id"/>
+		    </syspropertyset>
+        </java>
+
+    </target>
+
+    <target name="execute-import-hsql" if="org.apache.jetspeed.database.is.hsql.embedded">
+
+        <!-- construct embedded hsql classpath -->
+        <dependencies filesetId="hsql.embedded.db.dependencies.id" useScope="test">
+            <dependency groupId="hsqldb"
+                        artifactId="hsqldb"
+                        version="${hsqldb.version}"/>
+        </dependencies>
+
+        <!-- execute import utility with drivers path in classpath -->
+        <java classname="org.apache.jetspeed.page.PageImporter" fork="yes" dir="${basedir}">
+            <classpath>
+                <fileset refid="page.manager.dependencies.id"/>
+                <fileset refid="hsql.embedded.db.dependencies.id"/>
+                <pathelement path="${basedir}/target/classes"/>
+            </classpath>
+		    <syspropertyset>
+                <propertyset refid="import.syspropertyset.id"/>
+		    </syspropertyset>
+        </java>
+
+    </target>
+
+    <!-- Utilities -->
+
+    <target name="test-populate-skip">
+        <condition property="org.apache.jetspeed.skip.psml">
+            <or>
+                <equals arg1="${org.apache.jetspeed.database.skip}" arg2="true"/>
+                <not>
+                    <equals arg1="${org.apache.jetspeed.database.enable}" arg2="true"/>
+                </not>
+                <not>
+                    <equals arg1="${org.apache.jetspeed.database.psml}" arg2="true"/>
+                </not>
+            </or>
+        </condition>
+    </target>
+
+    <target name="test-database-classpath">
+        <condition property="org.apache.jetspeed.database.use.drivers.path">
+            <and>
+                <not><equals arg1="${org.apache.jetspeed.database.jdbc.drivers.path}" arg2=""/></not>
+                <not><equals arg1="${org.apache.jetspeed.database.default.name}" arg2="derby"/></not>
+                <not><equals arg1="${org.apache.jetspeed.database.default.name}" arg2="hsql"/></not>
+            </and>
+        </condition>
+        <condition property="org.apache.jetspeed.database.is.derby.embedded">
+            <and>
+                <equals arg1="${org.apache.jetspeed.database.default.name}" arg2="derby"/>
+                <equals arg1="${org.apache.jetspeed.database.jdbc.drivers.path}" arg2=""/>
+            </and>
+        </condition>
+        <condition property="org.apache.jetspeed.database.is.hsql.embedded">
+            <and>
+                <equals arg1="${org.apache.jetspeed.database.default.name}" arg2="hsql"/>
+                <equals arg1="${org.apache.jetspeed.database.jdbc.drivers.path}" arg2=""/>
+            </and>
+        </condition>
+    </target>
+
+    <target name="test-deploy-type">
+        <condition property="org.apache.jetspeed.deploy.full">
+            <equals arg1="${org.apache.jetspeed.deploy.type}" arg2="full"/>
+        </condition>
+        <condition property="org.apache.jetspeed.deploy.min">
+            <equals arg1="${org.apache.jetspeed.deploy.type}" arg2="min"/>
+        </condition>
+    </target>
+
+</project>
\ No newline at end of file

Added: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/export.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/export.properties?view=auto&rev=496506
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/export.properties (added)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/export.properties Mon Jan 15 13:46:09 2007
@@ -0,0 +1,17 @@
+# comma-separated list of boot assemblies for Spring
+boot.assemblies =  repository-datasource-spring.xml
+# comma-separated list of assemblies for Spring
+assemblies = import-page-manager.xml, transaction.xml, interceptors.xml
+# root folder to start importing from
+root.folder = /
+# overwrite folders flag, set to true to replace existing folders
+overwrite.folders = true
+# overwrite pages flag, set to true to replace existing pages 
+overwrite.pages = true
+# if this flag is true, will also try to export page.security 
+full.import = true
+# source page manager Spring component name
+source.page.manager = dbPageManager
+# destination page manager Spring component name
+dest.page.manager = castorPageManager
+

Added: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/import.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/import.properties?view=auto&rev=496506
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/import.properties (added)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/import.properties Mon Jan 15 13:46:09 2007
@@ -0,0 +1,16 @@
+# comma-separated list of boot assemblies for Spring
+boot.assemblies =  repository-datasource-spring.xml
+# comma-separated list of assemblies for Spring
+assemblies = import-page-manager.xml, transaction.xml, interceptors.xml
+# root folder to start exporting from
+root.folder = /
+# overwrite folders flag, set to true to replace existing folders
+overwrite.folders = true
+# overwrite pages flag, set to true to replace existing pages 
+overwrite.pages = true
+# if this flag is true, will also try to import page.security 
+full.import = true
+# source page manager Spring component name
+source.page.manager = castorPageManager
+# destination page manager Spring component name
+dest.page.manager = dbPageManager

Added: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/pom.xml?view=auto&rev=496506
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/pom.xml (added)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/pom.xml Mon Jan 15 13:46:09 2007
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2006 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
+
+    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:$
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    <prerequisites>
+        <maven>2.0.4</maven>
+    </prerequisites>
+
+    <!-- POM Identification -->
+
+    <artifactId>import</artifactId>
+    <parent>
+        <groupId>org.apache.portals.jetspeed-2</groupId>
+        <artifactId>jetspeed-2</artifactId>
+        <version>2.1-dev</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <packaging>pom</packaging>
+    <name>Jetspeed-2 PSML Database Import</name>
+    <description>
+        Project used to import the PSML configuration into the production database.
+    </description>
+
+    <!-- Profiles -->
+
+    <profiles>
+
+        <!-- derby database profile -->
+        <profile>
+            <id>jetspeed-db-embedded-derby</id>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.derby</groupId>
+                    <artifactId>derby</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
+
+        <!-- hsql database profile -->
+        <profile>
+            <id>jetspeed-db-embedded-hsql</id>
+            <dependencies>
+                <dependency>
+                    <groupId>hsqldb</groupId>
+                    <artifactId>hsqldb</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
+
+    </profiles>
+
+    <!-- Build Configuration -->
+
+    <build>
+
+        <!-- Plugin Executions -->
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+
+                    <!-- populate production database instance with PSML -->
+                    <execution>
+                        <id>etc-populate-production-psml</id>
+                        <phase>install</phase>
+                        <configuration>
+                            <tasks>
+                                <ant target="populate-db-psml" antfile="build.xml" dir="${basedir}" inheritRefs="on">
+                                    <property name="org.apache.jetspeed.database.enable"
+                                              value="${org.apache.jetspeed.env.deploy.db}"/>
+                                    <property name="org.apache.jetspeed.database.skip"
+                                              value="${org.apache.jetspeed.env.skip.production}"/>
+                                    <property name="org.apache.jetspeed.database.psml"
+                                              value="${org.apache.jetspeed.env.deploy.db.psml}"/>
+                                    <property name="org.apache.jetspeed.deploy.type"
+                                              value="${org.apache.jetspeed.env.deploy.type}"/>
+                                    <property name="org.apache.jetspeed.database.default.name"
+                                              value="${org.apache.jetspeed.production.database.default.name}"/>
+                                    <property name="org.apache.jetspeed.database.url"
+                                              value="${org.apache.jetspeed.production.database.url}"/>
+                                    <property name="org.apache.jetspeed.database.jdbc.drivers.path"
+                                              value="${org.apache.jetspeed.production.jdbc.drivers.path}"/>
+                                    <property name="org.apache.jetspeed.database.driver"
+                                              value="${org.apache.jetspeed.production.database.driver}"/>
+                                    <property name="org.apache.jetspeed.database.user"
+                                              value="${org.apache.jetspeed.production.database.user}"/>
+                                    <property name="org.apache.jetspeed.database.password"
+                                              value="${org.apache.jetspeed.production.database.password}"/>
+                                    <property name="org.apache.derby.version"
+                                              value="${org.apache.derby.version}"/>
+                                    <property name="hsqldb.version"
+                                              value="${hsqldb.version}"/>
+                                    <property name="org.apache.jetspeed.groupid"
+                                              value="${pom.groupId}"/>
+                                    <property name="org.apache.jetspeed.version"
+                                              value="${pom.version}"/>
+                                    <property name="org.apache.pluto.version"
+                                              value="${org.apache.pluto.version}"/>
+                                    <property name="portlet-api.version"
+                                              value="${portlet-api.version}"/>
+                                </ant>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <!-- Dependencies -->
+
+    <dependencies>
+
+        <!-- Provided Dependencies -->
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>jetspeed-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>jetspeed-commons</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Test Dependencies -->
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>etc</artifactId>
+            <type>pom</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>jetspeed-page-manager</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <!-- Project Information -->
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/etc/import</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/etc/import</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/etc/import/</url>
+    </scm>
+
+</project>

Modified: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml?view=diff&rev=496506&r1=496505&r2=496506
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml Mon Jan 15 13:46:09 2007
@@ -132,6 +132,7 @@
         
         <org.apache.portals.portal.version>${version}</org.apache.portals.portal.version>
         <org.apache.portals.portal.name>${artifactId}</org.apache.portals.portal.name>
+        <org.apache.jetspeed.env.deploy.type>full</org.apache.jetspeed.env.deploy.type>
 
     </properties>
 



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