Skip to content

Commit

Permalink
Merge branch 'ARIES-1006' into trunk
Browse files Browse the repository at this point in the history 
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk@1598705 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
@jbonofre
jbonofre committed May 30, 2014
1 parent 7fd4794 commit 2e23f30
Show file tree
Hide file tree
Showing 9 changed files with 287 additions and 259 deletions.
9 changes: 5 additions & 4 deletions transaction/pom.xml
View file
Expand Up @@ -19,14 +19,15 @@
-->
<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/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
<version>1.0.0</version>
<relativePath />
<artifactId>parent</artifactId>
<version>1.0.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>

<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.aries.transaction</groupId>
<artifactId>transaction</artifactId>
<packaging>pom</packaging>
Expand Down
46 changes: 24 additions & 22 deletions transaction/transaction-blueprint/pom.xml
View file
@@ -1,29 +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
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.
-->
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/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
<version>1.0.0</version>
<relativePath />
<artifactId>parent</artifactId>
<version>1.0.1-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>

<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.aries.transaction</groupId>
<artifactId>org.apache.aries.transaction.blueprint</artifactId>
<packaging>bundle</packaging>
Expand All @@ -32,14 +36,12 @@

<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/transaction/transaction-blueprint</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/transaction/transaction-blueprint
</developerConnection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/transaction/transaction-blueprint</developerConnection>
<url>http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-blueprint</url>
</scm>

<properties>
<!-- Export package versions are maintained in packageinfo files -->

<aries.osgi.export.pkg>
org.apache.aries.transaction.exception,
org.apache.aries.transaction.annotations
Expand All @@ -54,7 +56,6 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>4.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -110,7 +111,8 @@
<goal>version-check</goal>
</goals>
<configuration>
<oldArtifact>org.apache.aries.transaction:org.apache.aries.transaction.blueprint:1.0.1</oldArtifact>
<oldArtifact>org.apache.aries.transaction:org.apache.aries.transaction.blueprint:1.0.1
</oldArtifact>
</configuration>
</execution>
</executions>
Expand Down
3 changes: 2 additions & 1 deletion ...ction-blueprint/src/test/java/org/apache/aries/transaction/BaseNameSpaceHandlerSetup.java
View file
Expand Up @@ -21,6 +21,7 @@
import java.net.URI;
import java.net.URL;
import java.util.Arrays;
import java.util.Dictionary;
import java.util.Properties;
import java.util.Set;

Expand Down Expand Up @@ -76,7 +77,7 @@ public void setUp() {

Properties props = new Properties();
props.put("osgi.service.blueprint.namespace", new String[]{"http://aries.apache.org/xmlns/transactions/v1.0.0", "http://aries.apache.org/xmlns/transactions/v1.1.0", "http://aries.apache.org/xmlns/transactions/v1.2.0"});
ctx.registerService(NamespaceHandler.class.getName(), namespaceHandler, props);
ctx.registerService(NamespaceHandler.class.getName(), namespaceHandler, (Dictionary) props);
}

@After
Expand Down
162 changes: 84 additions & 78 deletions transaction/transaction-itests/pom.xml
View file
Expand Up @@ -18,30 +18,33 @@
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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
<version>1.0.0</version>
<relativePath />
<artifactId>parent</artifactId>
<version>1.0.1-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.transaction</groupId>
<artifactId>org.apache.aries.transaction.itests</artifactId>
<name>Apache Aries Transaction Integration Tests</name>
<version>1.0.1-SNAPSHOT</version>

<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/transaction/transaction-itests</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/transaction/transaction-itests</developerConnection>
<url>http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-itests</url>
</scm>

<groupId>org.apache.aries.transaction</groupId>
<artifactId>org.apache.aries.transaction.itests</artifactId>
<name>Apache Aries Transaction Integration Tests</name>
<version>1.0.1-SNAPSHOT</version>

<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/transaction/transaction-itests</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/transaction/transaction-itests</developerConnection>
<url>http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-itests</url>
</scm>

<properties>
<exam.version>3.4.0</exam.version>
<url.version>1.6.0</url.version>
</properties>

<dependencies>
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
Expand Down Expand Up @@ -90,24 +93,24 @@
<version>1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<version>2.0.0-SNAPSHOT</version>
<scope>test</scope>
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<version>2.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<version>3.8.0.v20120529-1548</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-all</artifactId>
<scope>test</scope>
<version>4.0</version>
</dependency>
<!-- pax exam -->
<scope>test</scope>
<version>4.0</version>
</dependency>

<!-- pax exam -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Expand Down Expand Up @@ -160,10 +163,10 @@
<artifactId>tinybundles</artifactId>
<version>2.0.0</version>
<exclusions>
<exclusion>
<artifactId>org.osgi.core</artifactId>
<groupId>org.osgi</groupId>
</exclusion>
<exclusion>
<artifactId>org.osgi.core</artifactId>
<groupId>org.osgi</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand All @@ -172,53 +175,56 @@
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>depends-maven-plugin</artifactId>
<executions>
<execution>
<id>generate-depends-file</id>
<goals>
<goal>generate-depends-file</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>pertest</forkMode>
</configuration>
</plugin>
</plugins>
</build>

<build>
<plugins>
<plugin>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>depends-maven-plugin</artifactId>
<executions>
<execution>
<id>generate-depends-file</id>
<goals>
<goal>generate-depends-file</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>pertest</forkMode>
</configuration>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>ci-build-profile</id>
<activation>
<property>
<name>maven.repo.local</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>pertest</forkMode>
<!--
when the local repo location has been specified, we need to pass
on this information to PAX mvn url
-->
<argLine>-Dorg.ops4j.pax.url.mvn.localRepository=${maven.repo.local}</argLine>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<profile>
<id>ci-build-profile</id>
<activation>
<property>
<name>maven.repo.local</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>pertest</forkMode>
<!--
when the local repo location has been specified, we need to pass
on this information to PAX mvn url
-->
<argLine>-Dorg.ops4j.pax.url.mvn.localRepository=${maven.repo.local}</argLine>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>

0 comments on commit 2e23f30

Please sign in to comment.