[jboss-cvs] JBossAS SVN: r112099 - in branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0: ejb3/src/main/org/jboss/ejb3/deployers and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Aug 19 14:44:31 EDT 2011
Author: manaRH
Date: 2011-08-19 14:44:30 -0400 (Fri, 19 Aug 2011)
New Revision: 112099
Modified:
branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/build/build-thirdparty.xml
branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/ejb3/src/main/org/jboss/ejb3/deployers/PersistenceUnitParsingDeployer.java
branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/embedded/build.xml
Log:
JBPAPP-5456 new build of Embedded for jsf-facelets patch
Modified: branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/build/build-thirdparty.xml
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/build/build-thirdparty.xml 2011-08-19 18:03:59 UTC (rev 112098)
+++ branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/build/build-thirdparty.xml 2011-08-19 18:44:30 UTC (rev 112099)
@@ -74,8 +74,8 @@
<componentref name="easymock" version="1.1"/>
<componentref name="gjt-jpl-util" version="1.0"/>
<componentref name="gnu-getopt" version="1.0.12-brew"/>
- <componentref name="hibernate" version="3.3.2.GA_CP02-brew"/>
- <componentref name="hibernate-annotations" version="3.4.0.GA_CP02-brew"/>
+ <componentref name="hibernate" version="3.3.2.GA_CP04-brew"/>
+ <componentref name="hibernate-annotations" version="3.4.0.GA_CP04-brew"/>
<componentref name="hibernate-commons-annotations" version="3.1.0.GA-brew"/>
<componentref name="hibernate-entitymanager" version="3.4.0.GA_CP02-brew"/>
<componentref name="hibernate-validator" version="3.1.0.GA-brew"/>
@@ -88,7 +88,7 @@
<componentref name="jboss/aop" version="2.0.0.CR1"/>
<componentref name="jboss/cache/jbosscache-core" version="3.2.5.GA-brew"/>
<componentref name="jboss/cache/jbosscache-pojo" version="3.0.0.GA-brew"/>
- <componentref name="jboss/common-core" version="2.2.3.GA"/>
+ <componentref name="jboss/common-core" version="2.2.17.GA-brew"/>
<componentref name="jboss/common-logging-jdk" version="2.0.2.GA"/>
<componentref name="jboss/common-logging-log4j" version="2.0.2.GA"/>
<componentref name="jboss/common-logging-spi" version="2.0.2.GA"/>
@@ -104,7 +104,7 @@
<componentref name="jboss/jbosssx" version="2.0.2.beta1"/>
<componentref name="jboss/jbosssx-client" version="2.0.2.beta"/>
<componentref name="jboss/jbossts" version="4.3.0.BETA2"/>
- <componentref name="jboss/jboss-vfs" version="2.0.0.Beta6"/>
+ <componentref name="jboss/jboss-vfs" version="2.2.0.GA-brew"/>
<componentref name="jboss/jbossws-native50" version="2.0.2.GA"/>
<componentref name="jboss/jbossxb" version="2.0.0.CR5"/>
<componentref name="jboss/jms-integration-tests" version="1.0.1.GA"/>
@@ -117,7 +117,7 @@
<componentref name="jboss/test" version="1.0.4.GA"/>
<componentref name="jboss/web" version="2.1.0.CR11"/>
<componentref name="jfreechart" version="0.9.20"/>
- <componentref name="jgroups" version="2.6.15.GA-brew"/>
+ <componentref name="jgroups" version="2.6.19.Final-brew"/>
<componentref name="joesnmp" version="0.3.4-brew"/>
<componentref name="juddi" version="0.9RC4-brew"/>
<componentref name="junit" version="3.8.2-brew"/>
Modified: branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/ejb3/src/main/org/jboss/ejb3/deployers/PersistenceUnitParsingDeployer.java
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/ejb3/src/main/org/jboss/ejb3/deployers/PersistenceUnitParsingDeployer.java 2011-08-19 18:03:59 UTC (rev 112098)
+++ branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/ejb3/src/main/org/jboss/ejb3/deployers/PersistenceUnitParsingDeployer.java 2011-08-19 18:44:30 UTC (rev 112099)
@@ -34,6 +34,7 @@
import org.jboss.ejb3.metadata.jpa.spec.PersistenceUnitsMetaData;
import org.jboss.ejb3.protocol.jarjar.Handler;
import org.jboss.logging.Logger;
+import org.jboss.virtual.VFSUtils;
import org.jboss.virtual.VirtualFile;
/**
@@ -46,7 +47,7 @@
* WEB-INF/classes/META-INF/persistence.xml
*
* @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
+ * @version $Revision$
*/
public class PersistenceUnitParsingDeployer extends AbstractVFSParsingDeployer<PersistenceUnitsMetaData>
{
@@ -106,10 +107,10 @@
//URL persistenceUnitRootUrl = new URL("jarjar:" + persistenceRoot.getHandler().toURL());
// http://opensource.atlassian.com/projects/hibernate/browse/EJB-326
- URL persistenceUnitRootUrl = persistenceRoot.getHandler().toURL();
+ URL persistenceUnitRootUrl = VFSUtils.getRealURL(persistenceRoot);
assert persistenceUnitRootUrl.getProtocol().equals("jar") || persistenceUnitRootUrl.getProtocol().equals("file") : "expected a jar or file url, but was " + persistenceUnitRootUrl;
- URL persistenceXmlUrl = file.toURL();
+ URL persistenceXmlUrl = VFSUtils.getRealURL(file);
PersistenceUnitsMetaData metaData = new PersistenceUnitsMetaData(persistenceUnitRootUrl, PersistenceXmlLoader.deploy(persistenceXmlUrl, new HashMap<String, String>(),
new EJB3DTDEntityResolver(), PersistenceUnitTransactionType.JTA));
log.info("Found persistence units " + metaData);
Modified: branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/embedded/build.xml
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/embedded/build.xml 2011-08-19 18:03:59 UTC (rev 112098)
+++ branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/embedded/build.xml 2011-08-19 18:44:30 UTC (rev 112099)
@@ -18,7 +18,7 @@
<project default="main" name="JBoss/Embedded">
- <property name="embedded.version" value="embedded-jboss-beta3.SP13"/>
+ <property name="embedded.version" value="embedded-jboss-beta3.SP14"/>
<!-- ================================================================== -->
<!-- Setup -->
@@ -533,7 +533,7 @@
<include name="**"/>
</fileset>
</javadoc>
- <property name="embedded.version" value="embedded-jboss-beta3.SP13"/>
+ <property name="embedded.version" value="embedded-jboss-beta3.SP14"/>
<zip zipfile="${embedded.version}.zip">
<zipfileset dir="." prefix="${embedded.version}">
<include name="DOCUMENTATION.html"/>
More information about the jboss-cvs-commits
mailing list