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/09 22:57:46 UTC
svn commit: r505523 - in /incubator/roller/branches/roller_4.0: ./
apps/planet/ apps/planet/testdata/META-INF/ nbproject/ tools/roller-planet/
web/WEB-INF/classes/META-INF/
Author: snoopdave
Date: Fri Feb 9 13:57:45 2007
New Revision: 505523
URL: http://svn.apache.org/viewvc?view=rev&rev=505523
Log:
Roller UI working with JPA now
Modified:
incubator/roller/branches/roller_4.0/CHANGES.txt
incubator/roller/branches/roller_4.0/apps/planet/build.xml
incubator/roller/branches/roller_4.0/apps/planet/testdata/META-INF/persistence.xml
incubator/roller/branches/roller_4.0/build.xml
incubator/roller/branches/roller_4.0/nbproject/project.xml
incubator/roller/branches/roller_4.0/tools/roller-planet/roller-planet-business.jar
incubator/roller/branches/roller_4.0/web/WEB-INF/classes/META-INF/persistence.xml
Modified: incubator/roller/branches/roller_4.0/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/CHANGES.txt?view=diff&rev=505523&r1=505522&r2=505523
==============================================================================
--- incubator/roller/branches/roller_4.0/CHANGES.txt (original)
+++ incubator/roller/branches/roller_4.0/CHANGES.txt Fri Feb 9 13:57:45 2007
@@ -2,6 +2,12 @@
ROLLER CHANGE LOG
-----------------
+Roller 4.0: Infrastructure upgrade - Java SE 5, Struts 2 and new JPA? backend
+
+ * New Java Persistence Architecture (JPA) backend added to Roller
+ * New components/core common code directory added, builds to roller-core.jar
+
+
Roller 3.1: weblog tagging, better theme encapsulation, and other small features
Please refer to the What's New page for an overview of the changes:
Modified: incubator/roller/branches/roller_4.0/apps/planet/build.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/apps/planet/build.xml?view=diff&rev=505523&r1=505522&r2=505523
==============================================================================
--- incubator/roller/branches/roller_4.0/apps/planet/build.xml (original)
+++ incubator/roller/branches/roller_4.0/apps/planet/build.xml Fri Feb 9 13:57:45 2007
@@ -172,6 +172,8 @@
<copy todir="${build.compile.business}">
<fileset dir="${src}" excludes="**/*.java, **/*.html, **/*.png" />
</copy>
+ <mkdir dir="${build.compile.business}/META-INF" />
+ <copy todir="${build.compile.business}" file="testdata/META-INF/persistence.xml" />
<!-- Jar up the business layer -->
<mkdir dir="${build.lib}"/>
Modified: incubator/roller/branches/roller_4.0/apps/planet/testdata/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/apps/planet/testdata/META-INF/persistence.xml?view=diff&rev=505523&r1=505522&r2=505523
==============================================================================
--- incubator/roller/branches/roller_4.0/apps/planet/testdata/META-INF/persistence.xml (original)
+++ incubator/roller/branches/roller_4.0/apps/planet/testdata/META-INF/persistence.xml Fri Feb 9 13:57:45 2007
@@ -2,12 +2,11 @@
<persistence-unit name ="PlanetPU" transaction-type = "RESOURCE_LOCAL">
<provider>oracle.toplink.essentials.ejb.cmp3.EntityManagerFactoryProvider</provider>
-
- <mapping-file>org/apache/roller/planet/pojos/PlanetConfigData.orm.xml</mapping-file>
- <mapping-file>org/apache/roller/planet/pojos/PlanetEntryData.orm.xml</mapping-file>
- <mapping-file>org/apache/roller/planet/pojos/PlanetGroupData.orm.xml</mapping-file>
- <mapping-file>org/apache/roller/planet/pojos/PlanetSubscriptionData.orm.xml</mapping-file>
-
+ <jta-data-source>jdbc/rollerdb</jta-data-source>
+ <mapping-file>org/apache/roller/planet/pojos/PlanetConfigData.orm.xml</mapping-file>
+ <mapping-file>org/apache/roller/planet/pojos/PlanetEntryData.orm.xml</mapping-file>
+ <mapping-file>org/apache/roller/planet/pojos/PlanetGroupData.orm.xml</mapping-file>
+ <mapping-file>org/apache/roller/planet/pojos/PlanetSubscriptionData.orm.xml</mapping-file>
</persistence-unit>
</persistence>
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=505523&r1=505522&r2=505523
==============================================================================
--- incubator/roller/branches/roller_4.0/build.xml (original)
+++ incubator/roller/branches/roller_4.0/build.xml Fri Feb 9 13:57:45 2007
@@ -408,6 +408,7 @@
<fileset refid="presentation.jars" />
<fileset refid="hibernate.jar" />
<fileset refid="hibernate.jars" />
+ <fileset refid="jpa.jars" />
<fileset refid="commons.jars" />
<fileset refid="struts.jars" />
<fileset refid="spring.jars" />
Modified: incubator/roller/branches/roller_4.0/nbproject/project.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/nbproject/project.xml?view=diff&rev=505523&r1=505522&r2=505523
==============================================================================
--- incubator/roller/branches/roller_4.0/nbproject/project.xml (original)
+++ incubator/roller/branches/roller_4.0/nbproject/project.xml Fri Feb 9 13:57:45 2007
@@ -133,7 +133,7 @@
<package-root>build/generated/business</package-root>
<package-root>build/generated/web</package-root>
<package-root>tests</package-root>
- <classpath mode="compile">tools/lib/commons-betwixt-1.0-beta-1.jar:tools/lib/commons-codec-1.3.jar:tools/lib/commons-httpclient-2.0.2.jar:tools/lib/concurrent-1.3.2.jar:tools/lib/jaxen-full.jar:tools/lib/jdom.jar:tools/lib/log4j-1.2.11.jar:tools/lib/lucene-1.4.3.jar:tools/lib/rome-0.9.jar:tools/lib/rome-fetcher-0.9.jar:tools/lib/saxpath.jar:tools/lib/taglibs-string.jar:tools/lib/velocity-1.4.jar:tools/lib/velocity-dep-1.4.jar:tools/lib/xmlrpc-1.2-b1.jar:tools/hibernate-3.1/hibernate3.jar:tools/hibernate-3.1/lib/asm-attrs.jar:tools/hibernate-3.1/lib/asm.jar:tools/hibernate-3.1/lib/cglib-2.1.3.jar:tools/hibernate-3.1/lib/dom4j-1.6.1.jar:tools/hibernate-3.1/lib/ehcache-1.1.jar:tools/hibernate-3.1/lib/jdbc2_0-stdext.jar:tools/hibernate-3.1/lib/jta.jar:tools/spring-1.2/acegi-security-1.0.1.jar:tools/spring-1.2/spring.jar:tools/struts-1.2.4/lib/antlr.jar:tools/struts-1.2.4/lib/commons-beanutils.jar:tools/struts-1.2.4/lib/commons-collections.jar:tools/struts-1.2.4/l
ib/commons-digester.jar:tools/struts-1.2.4/lib/commons-fileupload.jar:tools/struts-1.2.4/lib/commons-lang-2.0.jar:tools/struts-1.2.4/lib/commons-logging.jar:tools/struts-1.2.4/lib/commons-validator.jar:tools/struts-1.2.4/lib/jakarta-oro.jar:tools/struts-1.2.4/lib/struts-el.jar:tools/struts-1.2.4/lib/struts.jar:tools/jpa/toplink-essentials.jar</classpath>
+ <classpath mode="compile">tools/lib/commons-betwixt-1.0-beta-1.jar:tools/lib/commons-codec-1.3.jar:tools/lib/commons-httpclient-2.0.2.jar:tools/lib/concurrent-1.3.2.jar:tools/lib/jaxen-full.jar:tools/lib/jdom.jar:tools/lib/log4j-1.2.11.jar:tools/lib/lucene-1.4.3.jar:tools/lib/rome-0.9.jar:tools/lib/rome-fetcher-0.9.jar:tools/lib/saxpath.jar:tools/lib/taglibs-string.jar:tools/lib/velocity-1.4.jar:tools/lib/velocity-dep-1.4.jar:tools/lib/xmlrpc-1.2-b1.jar:tools/hibernate-3.1/hibernate3.jar:tools/hibernate-3.1/lib/asm-attrs.jar:tools/hibernate-3.1/lib/asm.jar:tools/hibernate-3.1/lib/cglib-2.1.3.jar:tools/hibernate-3.1/lib/dom4j-1.6.1.jar:tools/hibernate-3.1/lib/ehcache-1.1.jar:tools/hibernate-3.1/lib/jdbc2_0-stdext.jar:tools/hibernate-3.1/lib/jta.jar:tools/spring-1.2/acegi-security-1.0.1.jar:tools/spring-1.2/spring.jar:tools/struts-1.2.4/lib/antlr.jar:tools/struts-1.2.4/lib/commons-beanutils.jar:tools/struts-1.2.4/lib/commons-collections.jar:tools/struts-1.2.4/l
ib/commons-digester.jar:tools/struts-1.2.4/lib/commons-fileupload.jar:tools/struts-1.2.4/lib/commons-lang-2.0.jar:tools/struts-1.2.4/lib/commons-logging.jar:tools/struts-1.2.4/lib/commons-validator.jar:tools/struts-1.2.4/lib/jakarta-oro.jar:tools/struts-1.2.4/lib/struts-el.jar:tools/struts-1.2.4/lib/struts.jar:tools/jpa/toplink-essentials.jar:tools/buildtime/junit-3.8.1.jar</classpath>
<source-level>1.5</source-level>
</compilation-unit>
</java-data>
Modified: incubator/roller/branches/roller_4.0/tools/roller-planet/roller-planet-business.jar
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/tools/roller-planet/roller-planet-business.jar?view=diff&rev=505523&r1=505522&r2=505523
==============================================================================
Binary files - no diff available.
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=505523&r1=505522&r2=505523
==============================================================================
--- 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 Fri Feb 9 13:57:45 2007
@@ -2,6 +2,7 @@
<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>
@@ -25,6 +26,6 @@
<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-unit>
</persistence>