Repository: deltaspike Updated Branches: refs/heads/master 6114dd63f -> 834d742c2
DELTASPIKE-589 WLS profile specific files Works fine on Glassfish 4 - couldn't verify yet on a WLS instance itself due to general CDI deployment issues. Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/834d742c Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/834d742c Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/834d742c Branch: refs/heads/master Commit: 834d742c24d3b5e9f54fee1d23a233aee8a1dac4 Parents: 6114dd6 Author: Thomas Hug <[email protected]> Authored: Fri May 9 13:52:26 2014 +0200 Committer: Thomas Hug <[email protected]> Committed: Fri May 9 13:52:26 2014 +0200 ---------------------------------------------------------------------- deltaspike/modules/data/impl/pom.xml | 13 ++++++++ .../test-mapped-persistence.xml | 35 ++++++++++++++++++++ .../resources-weblogic/test-persistence.xml | 33 ++++++++++++++++++ 3 files changed, 81 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/834d742c/deltaspike/modules/data/impl/pom.xml ---------------------------------------------------------------------- diff --git a/deltaspike/modules/data/impl/pom.xml b/deltaspike/modules/data/impl/pom.xml index 3755cc4..716927c 100755 --- a/deltaspike/modules/data/impl/pom.xml +++ b/deltaspike/modules/data/impl/pom.xml @@ -275,6 +275,19 @@ </dependency> </dependencies> </profile> + <profile> + <id>wls-remote-12c</id> + <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + </testResource> + <testResource> + <directory>src/test/resources-weblogic</directory> + </testResource> + </testResources> + </build> + </profile> </profiles> </project> http://git-wip-us.apache.org/repos/asf/deltaspike/blob/834d742c/deltaspike/modules/data/impl/src/test/resources-weblogic/test-mapped-persistence.xml ---------------------------------------------------------------------- diff --git a/deltaspike/modules/data/impl/src/test/resources-weblogic/test-mapped-persistence.xml b/deltaspike/modules/data/impl/src/test/resources-weblogic/test-mapped-persistence.xml new file mode 100644 index 0000000..6828961 --- /dev/null +++ b/deltaspike/modules/data/impl/src/test/resources-weblogic/test-mapped-persistence.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you 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. +--> +<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd";> + <persistence-unit name="test"> + <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider> + <mapping-file>META-INF/orm.xml</mapping-file> + <mapping-file>META-INF/custom-orm.xml</mapping-file> + <properties> + <property name="eclipselink.ddl-generation" value="drop-and-create-tables"/> + <property name="eclipselink.logging.level" value="FINE"/> + <property name="eclipselink.logging.parameters" value="true" /> + <property name="javax.persistence.jdbc.driver" value="org.hsqldb.jdbcDriver"/> + <property name="javax.persistence.jdbc.url" value="jdbc:hsqldb:."/> + <property name="javax.persistence.jdbc.user" value="sa"/> + <property name="javax.persistence.jdbc.password" value=""/> + </properties> + </persistence-unit> +</persistence> http://git-wip-us.apache.org/repos/asf/deltaspike/blob/834d742c/deltaspike/modules/data/impl/src/test/resources-weblogic/test-persistence.xml ---------------------------------------------------------------------- diff --git a/deltaspike/modules/data/impl/src/test/resources-weblogic/test-persistence.xml b/deltaspike/modules/data/impl/src/test/resources-weblogic/test-persistence.xml new file mode 100644 index 0000000..3fd1174 --- /dev/null +++ b/deltaspike/modules/data/impl/src/test/resources-weblogic/test-persistence.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you 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. +--> +<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd";> + <persistence-unit name="test"> + <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider> + <properties> + <property name="eclipselink.ddl-generation" value="drop-and-create-tables"/> + <property name="eclipselink.logging.level" value="FINE"/> + <property name="eclipselink.logging.parameters" value="true" /> + <property name="javax.persistence.jdbc.driver" value="org.hsqldb.jdbcDriver"/> + <property name="javax.persistence.jdbc.url" value="jdbc:hsqldb:."/> + <property name="javax.persistence.jdbc.user" value="sa"/> + <property name="javax.persistence.jdbc.password" value=""/> + </properties> + </persistence-unit> +</persistence>
