You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2007/02/26 15:48:15 UTC
svn commit: r511829 - in /incubator/roller/branches/roller_4.0: ./
testdata/WEB-INF/classes/META-INF/ tools/jpa/ tools/openjpa-0.9.6/
tools/roller-planet/ tools/struts-1.2.4/lib/ tools/toplink-essentials-9.1/
web/WEB-INF/classes/META-INF/
Author: snoopdave
Date: Mon Feb 26 06:48:11 2007
New Revision: 511829
URL: http://svn.apache.org/viewvc?view=rev&rev=511829
Log:
Adding OpenJPA jars and build logic, but commented out for now
Added:
incubator/roller/branches/roller_4.0/tools/openjpa-0.9.6/
incubator/roller/branches/roller_4.0/tools/openjpa-0.9.6/geronimo-j2ee-connector_1.5_spec.jar (with props)
incubator/roller/branches/roller_4.0/tools/openjpa-0.9.6/openjpa-all-0.9.6-incubating.jar (with props)
incubator/roller/branches/roller_4.0/tools/openjpa-0.9.6/persistence-api-1.0.jar (with props)
incubator/roller/branches/roller_4.0/tools/openjpa-0.9.6/serp-1.11.0.jar (with props)
incubator/roller/branches/roller_4.0/tools/roller-planet/roller-planet.war (with props)
incubator/roller/branches/roller_4.0/tools/struts-1.2.4/lib/commons-collections.jar-hide (with props)
incubator/roller/branches/roller_4.0/tools/toplink-essentials-9.1/
- copied from r511698, incubator/roller/branches/roller_4.0/tools/jpa/
Removed:
incubator/roller/branches/roller_4.0/tools/jpa/
incubator/roller/branches/roller_4.0/tools/struts-1.2.4/lib/commons-collections.jar
Modified:
incubator/roller/branches/roller_4.0/build.xml
incubator/roller/branches/roller_4.0/properties.xmlf
incubator/roller/branches/roller_4.0/testdata/WEB-INF/classes/META-INF/persistence.xml
incubator/roller/branches/roller_4.0/web/WEB-INF/classes/META-INF/persistence.xml
Modified: incubator/roller/branches/roller_4.0/build.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/build.xml?view=diff&rev=511829&r1=511828&r2=511829
==============================================================================
--- incubator/roller/branches/roller_4.0/build.xml (original)
+++ incubator/roller/branches/roller_4.0/build.xml Mon Feb 26 06:48:11 2007
@@ -323,6 +323,19 @@
<fileset dir="${build.generated.business}" excludes="**/*.java" />
</copy>
+ <!-- define the openjpac task; this can be done at the top of the -->
+ <!-- build.xml file, so it will be available for all targets
+ <taskdef name="openjpac" classname="org.apache.openjpa.ant.PCEnhancerTask" classpathref="business.path" />
+ <openjpac>
+ <config propertiesFile="web/WEB-INF/classes/META-INF/persistence.xml" />
+ <classpath>
+ <path refid="business.path"/>
+ <pathelement location="${build.compile.business}" />
+ <pathelement location="${build.compile.business}/org/apache/roller/pojos" />
+ &custom-jars;
+ </classpath>
+ </openjpac> -->
+
<!-- allow for custom build work -->
&custom-build-business;
@@ -884,11 +897,9 @@
<!--
Copy custom testing files which will overwrite some config files
-->
- <copy todir="${build.tests}">
+ <copy todir="${build.tests}" overwrite="true">
<fileset dir="${basedir}/testdata" />
</copy>
- <copy todir="${build.tests}/WEB-INF/classes"
- file="${basedir}/testdata/JPAEMF.properties" overwrite="true"/>
</target>
Modified: incubator/roller/branches/roller_4.0/properties.xmlf
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/properties.xmlf?view=diff&rev=511829&r1=511828&r2=511829
==============================================================================
--- incubator/roller/branches/roller_4.0/properties.xmlf (original)
+++ incubator/roller/branches/roller_4.0/properties.xmlf Mon Feb 26 06:48:11 2007
@@ -56,7 +56,10 @@
<property name="tools.struts" value="${ro.tools}/struts-1.2.4" />
<property name="tools.struts2" value="${ro.tools}/struts-2.0.1" />
<property name="tools.hibernate" value="${ro.tools}/hibernate-3.1" />
-<property name="tools.jpa" value="${ro.tools}/jpa" />
+<property name="tools.jpa" value="${ro.tools}/toplink-essentials-9.1" />
+<!--
+<property name="tools.jpa" value="${ro.tools}/openjpa-0.9.6" />
+-->
<property name="tools.spring" value="${ro.tools}/spring-1.2" />
<property name="tools.jstl" value="${ro.tools}/jakarta-taglibs-standard-1.1.2" />
<property name="tools.xdoclet" value="${ro.tools}/buildtime/xdoclet-1.2.3" />
@@ -85,6 +88,7 @@
<fileset id="base.jars" dir="${ro.tools}/lib">
<include name="commons-betwixt-1.0-beta-1.jar" />
<include name="commons-cache.jar" />
+ <include name="commons-collections-3.2.jar" />
<include name="commons-codec-1.3.jar" />
<include name="concurrent-1.3.2.jar"/>
<include name="jaxen-full.jar" />
@@ -148,7 +152,7 @@
<include name="*.jar"/>
</fileset>
-<fileset id="jpa.jars" dir="${ro.tools}/jpa">
+<fileset id="jpa.jars" dir="${tools.jpa}">
<include name="*.jar"/>
</fileset>
@@ -175,13 +179,14 @@
<fileset refid="commons.jars"/>
<fileset refid="roller-core.jars" />
<fileset refid="roller-planet.jars" />
+ <!-- JPA bytecode enhancement apparently wants JPA classes everywhere -->
+ <fileset refid="jpa.jars" />
</path>
<path id="business.path">
<path refid="base.path"/>
<fileset refid="hibernate.jar" />
<fileset refid="hibernate.jars" />
- <fileset refid="jpa.jars" />
</path>
<path id="presentation.path">
Modified: incubator/roller/branches/roller_4.0/testdata/WEB-INF/classes/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/testdata/WEB-INF/classes/META-INF/persistence.xml?view=diff&rev=511829&r1=511828&r2=511829
==============================================================================
--- incubator/roller/branches/roller_4.0/testdata/WEB-INF/classes/META-INF/persistence.xml (original)
+++ incubator/roller/branches/roller_4.0/testdata/WEB-INF/classes/META-INF/persistence.xml Mon Feb 26 06:48:11 2007
@@ -1,31 +1,32 @@
-<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
-
- <persistence-unit name ="RollerPU" transaction-type = "RESOURCE_LOCAL">
- <provider>oracle.toplink.essentials.ejb.cmp3.EntityManagerFactoryProvider</provider>
- <jta-data-source>jdbc/rollerdb</jta-data-source>
- <mapping-file>org/apache/roller/pojos/AutoPingData.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/pojos/BookmarkData.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/pojos/CommentData.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/pojos/EntryAttributeData.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/pojos/FolderData.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/pojos/HitCountData.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/pojos/ObjectAuditData.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/pojos/PermissionsData.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/pojos/PingCategoryRestrictionData.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/pojos/PingQueueEntryData.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/pojos/PingTargetData.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/pojos/RefererData.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/pojos/RoleData.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/pojos/RollerConfigData.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/pojos/RollerPropertyData.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/pojos/TaskLockData.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/pojos/UserData.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/pojos/WeblogCategoryData.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/pojos/WeblogEntryData.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/pojos/WeblogEntryTagAggregateData.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/pojos/WeblogEntryTagData.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/pojos/WeblogTemplate.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/pojos/WebsiteData.orm.xml </mapping-file>
- </persistence-unit>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence version="1.0" xmlns="http://java.sun.com/xml/ns/persistence">
+ <persistence-unit name="RollerPU" transaction-type="RESOURCE_LOCAL">
+ <provider>oracle.toplink.essentials.ejb.cmp3.EntityManagerFactoryProvider</provider>
+ <!--
+ <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
+ -->
+ <mapping-file>org/apache/roller/pojos/AutoPingData.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/BookmarkData.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/CommentData.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/EntryAttributeData.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/FolderData.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/HitCountData.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/ObjectAuditData.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/PermissionsData.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/PingCategoryRestrictionData.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/PingQueueEntryData.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/PingTargetData.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/RefererData.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/RoleData.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/RollerConfigData.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/RollerPropertyData.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/TaskLockData.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/UserData.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/WeblogCategoryData.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/WeblogEntryData.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/WeblogEntryTagAggregateData.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/WeblogEntryTagData.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/WeblogTemplate.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/WebsiteData.orm.xml </mapping-file>
+ </persistence-unit>
</persistence>
Added: incubator/roller/branches/roller_4.0/tools/openjpa-0.9.6/geronimo-j2ee-connector_1.5_spec.jar
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/tools/openjpa-0.9.6/geronimo-j2ee-connector_1.5_spec.jar?view=auto&rev=511829
==============================================================================
Binary file - no diff available.
Propchange: incubator/roller/branches/roller_4.0/tools/openjpa-0.9.6/geronimo-j2ee-connector_1.5_spec.jar
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/roller/branches/roller_4.0/tools/openjpa-0.9.6/geronimo-j2ee-connector_1.5_spec.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/roller/branches/roller_4.0/tools/openjpa-0.9.6/openjpa-all-0.9.6-incubating.jar
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/tools/openjpa-0.9.6/openjpa-all-0.9.6-incubating.jar?view=auto&rev=511829
==============================================================================
Binary file - no diff available.
Propchange: incubator/roller/branches/roller_4.0/tools/openjpa-0.9.6/openjpa-all-0.9.6-incubating.jar
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/roller/branches/roller_4.0/tools/openjpa-0.9.6/openjpa-all-0.9.6-incubating.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/roller/branches/roller_4.0/tools/openjpa-0.9.6/persistence-api-1.0.jar
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/tools/openjpa-0.9.6/persistence-api-1.0.jar?view=auto&rev=511829
==============================================================================
Binary file - no diff available.
Propchange: incubator/roller/branches/roller_4.0/tools/openjpa-0.9.6/persistence-api-1.0.jar
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/roller/branches/roller_4.0/tools/openjpa-0.9.6/persistence-api-1.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/roller/branches/roller_4.0/tools/openjpa-0.9.6/serp-1.11.0.jar
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/tools/openjpa-0.9.6/serp-1.11.0.jar?view=auto&rev=511829
==============================================================================
Binary file - no diff available.
Propchange: incubator/roller/branches/roller_4.0/tools/openjpa-0.9.6/serp-1.11.0.jar
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/roller/branches/roller_4.0/tools/openjpa-0.9.6/serp-1.11.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/roller/branches/roller_4.0/tools/roller-planet/roller-planet.war
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/tools/roller-planet/roller-planet.war?view=auto&rev=511829
==============================================================================
Binary file - no diff available.
Propchange: incubator/roller/branches/roller_4.0/tools/roller-planet/roller-planet.war
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/roller/branches/roller_4.0/tools/struts-1.2.4/lib/commons-collections.jar-hide
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/tools/struts-1.2.4/lib/commons-collections.jar-hide?view=auto&rev=511829
==============================================================================
Binary file - no diff available.
Propchange: incubator/roller/branches/roller_4.0/tools/struts-1.2.4/lib/commons-collections.jar-hide
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/roller/branches/roller_4.0/web/WEB-INF/classes/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/web/WEB-INF/classes/META-INF/persistence.xml?view=diff&rev=511829&r1=511828&r2=511829
==============================================================================
--- incubator/roller/branches/roller_4.0/web/WEB-INF/classes/META-INF/persistence.xml (original)
+++ incubator/roller/branches/roller_4.0/web/WEB-INF/classes/META-INF/persistence.xml Mon Feb 26 06:48:11 2007
@@ -2,6 +2,9 @@
<persistence-unit name ="RollerPU" transaction-type = "RESOURCE_LOCAL">
<provider>oracle.toplink.essentials.ejb.cmp3.EntityManagerFactoryProvider</provider>
+ <!--
+ <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
+ -->
<jta-data-source>jdbc/rollerdb</jta-data-source>
<mapping-file>org/apache/roller/pojos/AutoPingData.orm.xml </mapping-file>
<mapping-file>org/apache/roller/pojos/BookmarkData.orm.xml </mapping-file>
@@ -29,7 +32,10 @@
</persistence-unit>
<persistence-unit name ="PlanetPU" transaction-type = "RESOURCE_LOCAL">
+ <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
+ <!--
<provider>oracle.toplink.essentials.ejb.cmp3.EntityManagerFactoryProvider</provider>
+ -->
<jta-data-source>jdbc/rollerdb</jta-data-source>
<mapping-file>org/apache/roller/planet/pojos/PlanetData.orm.xml</mapping-file>
<mapping-file>org/apache/roller/planet/pojos/PlanetGroupData.orm.xml</mapping-file>