aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cschnei...@apache.org
Subject svn commit: r1705394 - in /aries/trunk/jpa: examples/ examples/tasklist-blueprint/ examples/tasklist-blueprint/src/main/resources/OSGI-INF/blueprint/ examples/tasklist-ds/ examples/tasklist-model/ itests/jpa-container-itest-karaf/ jpa-parent/
Date Sat, 26 Sep 2015 05:45:01 GMT
Author: cschneider
Date: Sat Sep 26 05:45:01 2015
New Revision: 1705394

URL: http://svn.apache.org/viewvc?rev=1705394&view=rev
Log:
Some fixed in examples

Modified:
    aries/trunk/jpa/examples/pom.xml
    aries/trunk/jpa/examples/tasklist-blueprint/pom.xml
    aries/trunk/jpa/examples/tasklist-blueprint/src/main/resources/OSGI-INF/blueprint/context.xml
    aries/trunk/jpa/examples/tasklist-ds/pom.xml
    aries/trunk/jpa/examples/tasklist-model/pom.xml
    aries/trunk/jpa/itests/jpa-container-itest-karaf/pom.xml
    aries/trunk/jpa/jpa-parent/pom.xml

Modified: aries/trunk/jpa/examples/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/examples/pom.xml?rev=1705394&r1=1705393&r2=1705394&view=diff
==============================================================================
--- aries/trunk/jpa/examples/pom.xml (original)
+++ aries/trunk/jpa/examples/pom.xml Sat Sep 26 05:45:01 2015
@@ -1,23 +1,12 @@
 <?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.
--->
-<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/xsd/maven-4.0.0.xsd">
+<!-- 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. -->
+<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/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -32,11 +21,86 @@
         <version>2.3.0-SNAPSHOT</version>
         <relativePath>../jpa-parent</relativePath>
     </parent>
-    
+
     <properties>
         <aries.skip.version.check>true</aries.skip.version.check>
+
+        <!-- Replace with fixed version when using for your own project -->
+        <aries.jpa.version>${project.version}</aries.jpa.version>
     </properties>
 
+    <dependencies>
+        <!-- Common Test dependencies -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.11</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+            <version>1.7.10</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.eclipse.persistence</groupId>
+                <artifactId>javax.persistence</artifactId>
+                <version>2.1.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.compendium</artifactId>
+                <version>5.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.aries.jpa.example</groupId>
+                <artifactId>org.apache.aries.jpa.example.tasklist.model</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.transaction</groupId>
+                <artifactId>javax.transaction-api</artifactId>
+                <version>1.2</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.servlet</groupId>
+                <artifactId>servlet-api</artifactId>
+                <version>2.5</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.aries.jpa</groupId>
+                <artifactId>org.apache.aries.jpa.api</artifactId>
+                <version>${aries.jpa.version}</version>
+            </dependency>
+
+            <!-- Test dependencies -->
+            <dependency>
+                <groupId>org.apache.aries.jpa</groupId>
+                <artifactId>org.apache.aries.jpa.support</artifactId>
+                <version>${aries.jpa.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.hibernate</groupId>
+                <artifactId>hibernate-entitymanager</artifactId>
+                <version>4.3.8.Final</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.derby</groupId>
+                <artifactId>derby</artifactId>
+                <version>10.11.1.1</version>
+                <scope>test</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <build>
         <plugins>
             <plugin>

Modified: aries/trunk/jpa/examples/tasklist-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/examples/tasklist-blueprint/pom.xml?rev=1705394&r1=1705393&r2=1705394&view=diff
==============================================================================
--- aries/trunk/jpa/examples/tasklist-blueprint/pom.xml (original)
+++ aries/trunk/jpa/examples/tasklist-blueprint/pom.xml Sat Sep 26 05:45:01 2015
@@ -35,8 +35,12 @@
             <artifactId>javax.persistence</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <groupId>javax.transaction</groupId>
+            <artifactId>javax.transaction-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
@@ -45,35 +49,17 @@
         <dependency>
             <groupId>org.apache.aries.jpa.example</groupId>
             <artifactId>org.apache.aries.jpa.example.tasklist.model</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.transaction</groupId>
-            <artifactId>org.apache.aries.transaction.blueprint</artifactId>
-            <version>1.0.2</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
         </dependency>
 
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.11</version>
-            <scope>test</scope>
-        </dependency>
+        <!-- Test dependencies -->
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
-            <version>4.3.8.Final</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.derby</groupId>
             <artifactId>derby</artifactId>
-            <version>10.11.1.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

Modified: aries/trunk/jpa/examples/tasklist-blueprint/src/main/resources/OSGI-INF/blueprint/context.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/examples/tasklist-blueprint/src/main/resources/OSGI-INF/blueprint/context.xml?rev=1705394&r1=1705393&r2=1705394&view=diff
==============================================================================
--- aries/trunk/jpa/examples/tasklist-blueprint/src/main/resources/OSGI-INF/blueprint/context.xml
(original)
+++ aries/trunk/jpa/examples/tasklist-blueprint/src/main/resources/OSGI-INF/blueprint/context.xml
Sat Sep 26 05:45:01 2015
@@ -18,30 +18,24 @@
 
 -->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-	xmlns:jpa="http://aries.apache.org/xmlns/jpa/v2.0.0"
-	xmlns:tx="http://aries.apache.org/xmlns/transactions/v1.2.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 https://osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
+    xmlns:jpa="http://aries.apache.org/xmlns/jpa/v2.0.0"
+    xmlns:tx="http://aries.apache.org/xmlns/transactions/v1.2.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 https://osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
 
-	<jpa:enable />
-	<tx:enable-annotations />
+    <jpa:enable />
+    <tx:enable-annotations />
 
-	<service ref="taskService" interface="org.apache.aries.jpa.example.tasklist.model.TaskService">
-	</service>
-	<bean id="taskService" class="org.apache.aries.jpa.example.tasklist.blueprint.impl.TaskServiceImpl">
-		<tx:transaction method="*"/>
-	</bean>
-    
-    <!-- 
-        We use the task service directly here to make the example smaller.
-        For a real project the UI might be in a separate bundle
-     -->
+    <service ref="taskService" interface="org.apache.aries.jpa.example.tasklist.model.TaskService"/>
+    <bean id="taskService" class="org.apache.aries.jpa.example.tasklist.blueprint.impl.TaskServiceImpl"/>
+
+    <!-- We use the task service directly here to make the example smaller. For a real
project the UI might be in a separate bundle -->
     <bean id="tasklistServlet" class="org.apache.aries.jpa.example.tasklist.blueprint.impl.TasklistServlet">
-        <property name="taskService" ref="taskService"/>
+        <property name="taskService" ref="taskService" />
     </bean>
     <service interface="javax.servlet.Servlet" ref="tasklistServlet">
         <service-properties>
-            <entry key="alias" value="/tasklist"/>
+            <entry key="alias" value="/tasklist" />
         </service-properties>
     </service>
 </blueprint>
\ No newline at end of file

Modified: aries/trunk/jpa/examples/tasklist-ds/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/examples/tasklist-ds/pom.xml?rev=1705394&r1=1705393&r2=1705394&view=diff
==============================================================================
--- aries/trunk/jpa/examples/tasklist-ds/pom.xml (original)
+++ aries/trunk/jpa/examples/tasklist-ds/pom.xml Sat Sep 26 05:45:01 2015
@@ -1,23 +1,12 @@
 <?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.
--->
-<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/xsd/maven-4.0.0.xsd">
+<!-- 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. -->
+<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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -36,8 +25,12 @@
             <artifactId>javax.persistence</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.jpa</groupId>
+            <artifactId>org.apache.aries.jpa.api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
@@ -46,48 +39,24 @@
         <dependency>
             <groupId>org.apache.aries.jpa.example</groupId>
             <artifactId>org.apache.aries.jpa.example.tasklist.model</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.jpa</groupId>
-            <artifactId>org.apache.aries.jpa.api</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
+        <!-- Test dependencies -->
         <dependency>
             <groupId>org.apache.aries.jpa</groupId>
             <artifactId>org.apache.aries.jpa.support</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.11</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
-            <version>4.3.8.Final</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.derby</groupId>
             <artifactId>derby</artifactId>
-            <version>10.11.1.1</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-jdk14</artifactId>
-            <version>1.7.10</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-        </dependency>
     </dependencies>
 
 </project>

Modified: aries/trunk/jpa/examples/tasklist-model/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/examples/tasklist-model/pom.xml?rev=1705394&r1=1705393&r2=1705394&view=diff
==============================================================================
--- aries/trunk/jpa/examples/tasklist-model/pom.xml (original)
+++ aries/trunk/jpa/examples/tasklist-model/pom.xml Sat Sep 26 05:45:01 2015
@@ -1,23 +1,12 @@
 <?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.
--->
-<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/xsd/maven-4.0.0.xsd">
+<!-- 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. -->
+<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/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -38,5 +27,4 @@
             <artifactId>javax.persistence</artifactId>
         </dependency>
     </dependencies>
-
 </project>

Modified: aries/trunk/jpa/itests/jpa-container-itest-karaf/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-container-itest-karaf/pom.xml?rev=1705394&r1=1705393&r2=1705394&view=diff
==============================================================================
--- aries/trunk/jpa/itests/jpa-container-itest-karaf/pom.xml (original)
+++ aries/trunk/jpa/itests/jpa-container-itest-karaf/pom.xml Sat Sep 26 05:45:01 2015
@@ -39,6 +39,11 @@
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: aries/trunk/jpa/jpa-parent/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-parent/pom.xml?rev=1705394&r1=1705393&r2=1705394&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-parent/pom.xml (original)
+++ aries/trunk/jpa/jpa-parent/pom.xml Sat Sep 26 05:45:01 2015
@@ -138,6 +138,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-resources-plugin</artifactId>
+                    <version>2.7</version>
                     <configuration>
                         <encoding>UTF-8</encoding>
                     </configuration>
@@ -148,6 +149,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.3</version>
                 <configuration>
                     <source>1.6</source>
                     <target>1.6</target>



Mime
View raw message