svn commit: r1750850 - in /aries/trunk/tx-control: ./ tx-control-api/ tx-control-api/src/main/java/org/osgi/service/transaction/control/ tx-control-api/src/main/java/org/osgi/service/transaction/contr
Author: timothyjward Date: Thu Jun 30 17:55:48 2016 New Revision: 1750850 URL: http://svn.apache.org/viewvc?rev=1750850=rev Log: [tx-control] Add support for resource recovery when using XA Added: aries/trunk/tx-control/tx-control-api/src/main/java/org/osgi/service/transaction/control/recovery/RecoverableXAResource.java aries/trunk/tx-control/tx-control-service-xa/src/main/java/org/apache/aries/tx/control/service/xa/impl/NamedXAResourceImpl.java aries/trunk/tx-control/tx-control-service-xa/src/main/java/org/apache/geronimo/ aries/trunk/tx-control/tx-control-service-xa/src/main/java/org/apache/geronimo/transaction/ aries/trunk/tx-control/tx-control-service-xa/src/main/java/org/apache/geronimo/transaction/manager/ aries/trunk/tx-control/tx-control-service-xa/src/main/java/org/apache/geronimo/transaction/manager/RecoveryWorkAroundTransactionManager.java Removed: aries/trunk/tx-control/tx-control-api/src/main/java/org/osgi/service/transaction/control/recovery/TransactionRecovery.java Modified: aries/trunk/tx-control/pom.xml aries/trunk/tx-control/tx-control-api/pom.xml aries/trunk/tx-control/tx-control-api/src/main/java/org/osgi/service/transaction/control/TransactionContext.java aries/trunk/tx-control/tx-control-itests/src/test/java/org/apache/aries/tx/control/itests/XATransactionTest.java aries/trunk/tx-control/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/XAJPATransactionTest.java aries/trunk/tx-control/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/impl/XAEnabledTxContextBindingConnection.java aries/trunk/tx-control/tx-control-provider-jdbc-xa/src/test/java/org/apache/aries/tx/control/jdbc/xa/impl/XAEnabledTxContextBindingConnectionTest.java aries/trunk/tx-control/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/eclipse/impl/EclipseTxControlPlatform.java aries/trunk/tx-control/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/JPAEntityManagerProviderFactoryImpl.java aries/trunk/tx-control/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/openjpa/impl/OpenJPATxControlPlatform.java aries/trunk/tx-control/tx-control-provider-jpa-xa/src/test/java/org/apache/aries/tx/control/jpa/xa/impl/XATxContextBindingEntityManagerTest.java aries/trunk/tx-control/tx-control-service-common/src/main/java/org/apache/aries/tx/control/service/common/impl/NoTransactionContextImpl.java aries/trunk/tx-control/tx-control-service-common/src/test/java/org/apache/aries/tx/control/service/common/impl/NoTransactionContextTest.java aries/trunk/tx-control/tx-control-service-local/src/main/java/org/apache/aries/tx/control/service/local/impl/TransactionContextImpl.java aries/trunk/tx-control/tx-control-service-local/src/test/java/org/apache/aries/tx/control/service/local/impl/TransactionContextTest.java aries/trunk/tx-control/tx-control-service-xa/bnd.bnd aries/trunk/tx-control/tx-control-service-xa/src/main/java/org/apache/aries/tx/control/service/xa/impl/Config.java aries/trunk/tx-control/tx-control-service-xa/src/main/java/org/apache/aries/tx/control/service/xa/impl/TransactionContextImpl.java aries/trunk/tx-control/tx-control-service-xa/src/main/java/org/apache/aries/tx/control/service/xa/impl/TransactionControlImpl.java aries/trunk/tx-control/tx-control-service-xa/src/test/java/org/apache/aries/tx/control/service/xa/impl/TransactionContextTest.java aries/trunk/tx-control/tx-control-service-xa/src/test/java/org/apache/aries/tx/control/service/xa/impl/TransactionLogTest.java Modified: aries/trunk/tx-control/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/pom.xml?rev=1750850=1750849=1750850=diff == --- aries/trunk/tx-control/pom.xml (original) +++ aries/trunk/tx-control/pom.xml Thu Jun 30 17:55:48 2016 @@ -104,7 +104,7 @@ org.slf4j slf4j-api - 1.6.6 + 1.7.0 org.apache.geronimo.specs Modified: aries/trunk/tx-control/tx-control-api/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-api/pom.xml?rev=1750850=1750849=1750850=diff == --- aries/trunk/tx-control/tx-control-api/pom.xml (original) +++ aries/trunk/tx-control/tx-control-api/pom.xml Thu Jun 30 17:55:48 2016 @@ -56,4 +56,5 @@ + \ No newline at end of file Modified: aries/trunk/tx-control/tx-control-api/src/main/java/org/osgi/service/transaction/control/TransactionContext.java URL:
svn commit: r1750849 - in /aries/trunk/tx-control: ./ tx-control-api/ tx-control-api/src/main/java/org/osgi/service/transaction/control/recovery/ tx-control-itests/ tx-control-jpa-itests/ tx-control-p
Author: timothyjward Date: Thu Jun 30 17:55:15 2016 New Revision: 1750849 URL: http://svn.apache.org/viewvc?rev=1750849=rev Log: [tx-control] Move to use the bnd-maven-plugin Added: aries/trunk/tx-control/tx-control-api/bnd.bnd aries/trunk/tx-control/tx-control-provider-jdbc-local/bnd.bnd aries/trunk/tx-control/tx-control-provider-jdbc-xa/bnd.bnd aries/trunk/tx-control/tx-control-provider-jpa-local/bnd.bnd aries/trunk/tx-control/tx-control-provider-jpa-xa/bnd.bnd aries/trunk/tx-control/tx-control-service-local/bnd.bnd aries/trunk/tx-control/tx-control-service-xa/bnd.bnd Removed: aries/trunk/tx-control/tx-control-api/src/main/java/org/osgi/service/transaction/control/recovery/package-info.java Modified: aries/trunk/tx-control/pom.xml aries/trunk/tx-control/tx-control-api/pom.xml aries/trunk/tx-control/tx-control-itests/pom.xml aries/trunk/tx-control/tx-control-jpa-itests/pom.xml aries/trunk/tx-control/tx-control-provider-jdbc-common/pom.xml aries/trunk/tx-control/tx-control-provider-jdbc-local/pom.xml aries/trunk/tx-control/tx-control-provider-jdbc-xa/pom.xml aries/trunk/tx-control/tx-control-provider-jpa-local/pom.xml aries/trunk/tx-control/tx-control-provider-jpa-xa/pom.xml aries/trunk/tx-control/tx-control-service-common/pom.xml aries/trunk/tx-control/tx-control-service-local/pom.xml aries/trunk/tx-control/tx-control-service-xa/pom.xml Modified: aries/trunk/tx-control/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/pom.xml?rev=1750849=1750848=1750849=diff == --- aries/trunk/tx-control/pom.xml (original) +++ aries/trunk/tx-control/pom.xml Thu Jun 30 17:55:15 2016 @@ -8,14 +8,16 @@ 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://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;> +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;> 4.0.0 - org.apache.aries - parent - 2.0.1 - ../parent/pom.xml + org.apache + apache + 17 + + org.apache.aries.tx-control tx-control 0.0.2-SNAPSHOT @@ -55,40 +57,120 @@ + + + + org.osgi + org.osgi.core + 6.0.0 + provided + + + org.osgi + osgi.annotation + 6.0.1 + provided + + + org.osgi + org.osgi.util.tracker + 1.5.1 + provided + + + org.osgi + org.osgi.service.cm + 1.5.0 + provided + + + org.osgi + org.osgi.service.jdbc + 1.0.0 + provided + + + org.osgi + org.osgi.service.jpa + 1.0.0 + provided + + + org.osgi + org.osgi.service.metatype.annotations + 1.3.0 + provided + + + org.slf4j + slf4j-api + 1.6.6 + + + org.apache.geronimo.specs + geronimo-jpa_2.1_spec + 1.0-alpha-1 + provided + + + com.zaxxer + HikariCP + 2.4.3 + provided +
svn commit: r1750823 [2/2] - in /aries/trunk/blueprint/blueprint-maven-plugin: ./ src/main/java/org/apache/aries/blueprint/plugin/ src/main/java/org/apache/aries/blueprint/plugin/javax/ src/main/java/
Added: aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanFinder URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanFinder?rev=1750823=auto == --- aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanFinder (added) +++ aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanFinder Thu Jun 30 16:18:59 2016 @@ -0,0 +1,20 @@ +# +# 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. +# + +org.apache.aries.blueprint.plugin.spring.ComponentBeanFinder +org.apache.aries.blueprint.plugin.javax.SingletonBeanFinder +org.apache.aries.blueprint.plugin.javax.NamedBeanFinder \ No newline at end of file Added: aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.InjectLikeHandler URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.InjectLikeHandler?rev=1750823=auto == --- aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.InjectLikeHandler (added) +++ aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.InjectLikeHandler Thu Jun 30 16:18:59 2016 @@ -0,0 +1,19 @@ +# +# 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. +# + +org.apache.aries.blueprint.plugin.spring.AutowiredAsInject +org.apache.aries.blueprint.plugin.javax.InjectHandler \ No newline at end of file Added: aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.NamedLikeHandler URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.NamedLikeHandler?rev=1750823=auto == --- aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.NamedLikeHandler (added) +++ aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.NamedLikeHandler Thu Jun 30 16:18:59 2016 @@ -0,0 +1,20 @@ +# +# 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. +# +
svn commit: r1750755 - /aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizer.java
Author: cschneider
Date: Thu Jun 30 07:46:33 2016
New Revision: 1750755
URL: http://svn.apache.org/viewvc?rev=1750755=rev
Log:
[ARIES-1584] Do not spam messages for each considered and skipped bundle
Modified:
aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizer.java
Modified:
aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizer.java
URL:
http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizer.java?rev=1750755=1750754=1750755=diff
==
---
aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizer.java
(original)
+++
aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizer.java
Thu Jun 30 07:46:33 2016
@@ -66,7 +66,7 @@ public class ProviderBundleTrackerCustom
}
public List addingBundle(final Bundle bundle,
BundleEvent event) {
-log(LogService.LOG_INFO, "Bundle Considered for SPI providers: "
+log(LogService.LOG_DEBUG, "Bundle Considered for SPI providers: "
+ bundle.getSymbolicName());
if (bundle.equals(spiBundle))
@@ -95,7 +95,7 @@ public class ProviderBundleTrackerCustom
}
if (providedServices == null) {
-log(LogService.LOG_INFO, "No '"
+log(LogService.LOG_DEBUG, "No '"
+ SpiFlyConstants.SPI_PROVIDER_HEADER
+ "' Manifest header. Skipping bundle: "
+ bundle.getSymbolicName());
