Author: csierra Date: Wed Mar 1 10:07:14 2017 New Revision: 1784899 URL: http://svn.apache.org/viewvc?rev=1784899&view=rev Log: [ARIES-CDI] create and use dependencies with contracts
Signed-off-by: Raymond Augé <[email protected]> Added: aries/trunk/cdi/cdi-itests/bnd/tb4-beans.xml aries/trunk/cdi/cdi-itests/bnd/tb4.bnd aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb4/ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb4/CallableImpl.java aries/trunk/cdi/javax.cdi-api/ aries/trunk/cdi/javax.cdi-api/LICENSE aries/trunk/cdi/javax.cdi-api/NOTICE aries/trunk/cdi/javax.cdi-api/bnd.bnd aries/trunk/cdi/javax.cdi-api/pom.xml aries/trunk/cdi/javax.cdi-api/src/ aries/trunk/cdi/javax.cdi-api/src/main/ aries/trunk/cdi/javax.cdi-api/src/main/resources/ aries/trunk/cdi/javax.cdi-api/src/main/resources/META-INF/ aries/trunk/cdi/javax.cdi-api/src/main/resources/META-INF/services/ aries/trunk/cdi/javax.cdi-api/src/main/resources/META-INF/services/javax.enterprise.inject.spi.CDIProvider - copied, changed from r1784898, aries/trunk/cdi/cdi-extender/src/main/resources/META-INF/services/javax.enterprise.inject.spi.CDIProvider aries/trunk/cdi/javax.el-api/ aries/trunk/cdi/javax.el-api/bnd.bnd - copied, changed from r1784898, aries/trunk/cdi/el-api/bnd.bnd aries/trunk/cdi/javax.el-api/pom.xml - copied, changed from r1784898, aries/trunk/cdi/el-api/pom.xml aries/trunk/cdi/javax.inject-api/ aries/trunk/cdi/javax.inject-api/LICENSE aries/trunk/cdi/javax.inject-api/NOTICE aries/trunk/cdi/javax.inject-api/bnd.bnd aries/trunk/cdi/javax.inject-api/pom.xml - copied, changed from r1784898, aries/trunk/cdi/el-api/pom.xml aries/trunk/cdi/javax.interceptor-api/ aries/trunk/cdi/javax.interceptor-api/LICENSE aries/trunk/cdi/javax.interceptor-api/NOTICE aries/trunk/cdi/javax.interceptor-api/bnd.bnd aries/trunk/cdi/javax.interceptor-api/pom.xml - copied, changed from r1784898, aries/trunk/cdi/el-api/pom.xml Removed: aries/trunk/cdi/cdi-extender/src/main/resources/META-INF/services/javax.enterprise.inject.spi.CDIProvider aries/trunk/cdi/el-api/bnd.bnd aries/trunk/cdi/el-api/pom.xml Modified: aries/trunk/cdi/cdi-executable/cdi-executable.bndrun aries/trunk/cdi/cdi-executable/pom.xml aries/trunk/cdi/cdi-extender/bnd.bnd aries/trunk/cdi/cdi-extender/pom.xml aries/trunk/cdi/cdi-extension-jndi/bnd.bnd aries/trunk/cdi/cdi-extension-jndi/pom.xml aries/trunk/cdi/cdi-itests/bnd.bnd aries/trunk/cdi/cdi-itests/itest.bndrun aries/trunk/cdi/cdi-itests/pom.xml aries/trunk/cdi/pom.xml Modified: aries/trunk/cdi/cdi-executable/cdi-executable.bndrun URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-executable/cdi-executable.bndrun?rev=1784899&r1=1784898&r2=1784899&view=diff ============================================================================== --- aries/trunk/cdi/cdi-executable/cdi-executable.bndrun (original) +++ aries/trunk/cdi/cdi-executable/cdi-executable.bndrun Wed Mar 1 10:07:14 2017 @@ -12,18 +12,19 @@ osgi.identity;filter:='(osgi.identity=slf4j.log4j12)' -runbundles: \ - jboss-classfilewriter;version='[1.1.2,1.1.3)',\ + jboss-classfilewriter;version='[1.2.1,1.2.2)',\ log4j;version='[1.2.17,1.2.18)',\ org.apache.aries.cdi.extender;version='[0.0.1,0.0.2)',\ - org.apache.aries.el-api;version='[0.0.1,0.0.2)',\ + org.apache.aries.javax.cdi-api;version='[0.0.1,0.0.2)',\ + org.apache.aries.javax.el-api;version='[0.0.1,0.0.2)',\ + org.apache.aries.javax.inject-api;version='[0.0.1,0.0.2)',\ + org.apache.aries.javax.interceptor-api;version='[0.0.1,0.0.2)',\ org.apache.felix.configadmin;version='[1.8.12,1.8.13)',\ org.apache.felix.gogo.command;version='[1.0.2,1.0.3)',\ org.apache.felix.gogo.jline;version='[1.0.2,1.0.3)',\ org.apache.felix.gogo.runtime;version='[1.0.2,1.0.3)',\ - org.apache.logging.log4j.api;version='[2.7.0,2.7.1)',\ - org.jboss.logging.jboss-logging;version='[3.2.1,3.2.2)',\ - org.jboss.spec.javax.annotation.jboss-annotations-api_1.2_spec;version='[1.0.0,1.0.1)',\ - org.jboss.spec.javax.interceptor.jboss-interceptors-api_1.2_spec;version='[1.0.0,1.0.1)',\ + org.apache.geronimo.specs.geronimo-annotation_1.2_spec;version='[1.0.0,1.0.1)',\ + org.jboss.logging.jboss-logging;version='[3.3.0,3.3.1)',\ org.jboss.weld.osgi-bundle;version='[2.4.0,2.4.1)',\ org.jline;version='[3.0.0,3.0.1)',\ org.osgi.service.cdi;version='[1.0.0,1.0.1)',\ Modified: aries/trunk/cdi/cdi-executable/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-executable/pom.xml?rev=1784899&r1=1784898&r2=1784899&view=diff ============================================================================== --- aries/trunk/cdi/cdi-executable/pom.xml (original) +++ aries/trunk/cdi/cdi-executable/pom.xml Wed Mar 1 10:07:14 2017 @@ -80,11 +80,26 @@ <version>1.0.2</version> </dependency> <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-annotation_1.2_spec</artifactId> + <version>1.0</version> + </dependency> + <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> <version>2.7</version> </dependency> <dependency> + <groupId>org.jboss.classfilewriter</groupId> + <artifactId>jboss-classfilewriter</artifactId> + <version>1.2.1.Final</version> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging</artifactId> + <version>3.3.0.Final</version> + </dependency> + <dependency> <groupId>org.osgi</groupId> <artifactId>org.eclipse.osgi</artifactId> <version>3.10.100.v20150529-1857</version> Modified: aries/trunk/cdi/cdi-extender/bnd.bnd URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/bnd.bnd?rev=1784899&r1=1784898&r2=1784899&view=diff ============================================================================== --- aries/trunk/cdi/cdi-extender/bnd.bnd (original) +++ aries/trunk/cdi/cdi-extender/bnd.bnd Wed Mar 1 10:07:14 2017 @@ -5,21 +5,12 @@ Conditional-Package: \ org.osgi.util.converter,\ org.osgi.util.function Export-Package: \ - javax.decorator,\ - javax.enterprise.*,\ - javax.inject;version='1.0.0',\ org.apache.aries.cdi.provider +#Import-Package: javax.el, javax.interceptor, * Provide-Capability: \ - osgi.contract; \ - osgi.contract=JavaCDI; \ - uses:="javax.decorator,javax.enterprise.context,javax.enterprise.context.spi,javax.enterprise.event,javax.enterprise.inject,javax.enterprise.inject.spi,javax.enterprise.util"; \ - version:List<Version>='1.0,1.1,1.2', \ - osgi.contract; \ - osgi.contract=JavaInject; \ - uses:="javax.inject"; \ - version:Version='1', \ osgi.extender; \ osgi.extender='osgi.cdi'; \ uses:="org.osgi.service.cdi,org.osgi.service.cdi.annotations,javax.enterprise.inject.spi"; \ version:Version="${Bundle-Version}" +-contract: JavaCDI, JavaEL, JavaInject, JavaInterceptor -includeresource: META-INF/=LICENSE, META-INF/=NOTICE \ No newline at end of file Modified: aries/trunk/cdi/cdi-extender/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/pom.xml?rev=1784899&r1=1784898&r2=1784899&view=diff ============================================================================== --- aries/trunk/cdi/cdi-extender/pom.xml (original) +++ aries/trunk/cdi/cdi-extender/pom.xml Wed Mar 1 10:07:14 2017 @@ -35,26 +35,8 @@ <dependencies> <dependency> - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> - <version>1.2</version> - <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>javax.el</groupId> - <artifactId>javax.el-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - <version>1</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.apache.aries.cdi</groupId> - <artifactId>org.apache.aries.el-api</artifactId> + <artifactId>org.apache.aries.javax.cdi-api</artifactId> <version>0.0.1-SNAPSHOT</version> </dependency> <dependency> @@ -85,8 +67,24 @@ <version>2.4.0.Final</version> <exclusions> <exclusion> - <groupId>org.jboss.spec.javax.el</groupId> - <artifactId>jboss-el-api_3.0_spec</artifactId> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core-impl</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core-jsf</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-spi</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.weld.probe</groupId> + <artifactId>weld-probe-core</artifactId> </exclusion> </exclusions> </dependency> Modified: aries/trunk/cdi/cdi-extension-jndi/bnd.bnd URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extension-jndi/bnd.bnd?rev=1784899&r1=1784898&r2=1784899&view=diff ============================================================================== --- aries/trunk/cdi/cdi-extension-jndi/bnd.bnd (original) +++ aries/trunk/cdi/cdi-extension-jndi/bnd.bnd Wed Mar 1 10:07:14 2017 @@ -1,5 +1,5 @@ Bundle-Activator: org.apache.aries.cdi.extension.jndi.Activator Provide-Capability: osgi.cdi.extension;osgi.cdi.extension=jndi;version:Version="${Bundle-Version}" -Require-Capability: osgi.contract;filter:="(&(osgi.contract=JavaCDI)(version=1.2))" +-contract: JavaCDI -includeresource: META-INF/=LICENSE, META-INF/=NOTICE \ No newline at end of file Modified: aries/trunk/cdi/cdi-extension-jndi/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extension-jndi/pom.xml?rev=1784899&r1=1784898&r2=1784899&view=diff ============================================================================== --- aries/trunk/cdi/cdi-extension-jndi/pom.xml (original) +++ aries/trunk/cdi/cdi-extension-jndi/pom.xml Wed Mar 1 10:07:14 2017 @@ -30,7 +30,7 @@ <dependencies> <dependency> <groupId>org.apache.aries.cdi</groupId> - <artifactId>org.apache.aries.cdi.extender</artifactId> + <artifactId>org.apache.aries.javax.cdi-api</artifactId> <version>0.0.1-SNAPSHOT</version> </dependency> <dependency> @@ -43,6 +43,11 @@ <artifactId>org.osgi.service.cdi</artifactId> <version>1.0.0-SNAPSHOT</version> </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>osgi.core</artifactId> + <version>6.0.0</version> + </dependency> </dependencies> </project> Modified: aries/trunk/cdi/cdi-itests/bnd.bnd URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/bnd.bnd?rev=1784899&r1=1784898&r2=1784899&view=diff ============================================================================== --- aries/trunk/cdi/cdi-itests/bnd.bnd (original) +++ aries/trunk/cdi/cdi-itests/bnd.bnd Wed Mar 1 10:07:14 2017 @@ -24,7 +24,8 @@ p = org.apache.aries.cdi.test services-one.jar,\ tb1.jar,\ tb2.jar,\ - tb3.jar + tb3.jar,\ + tb4.jar # Don't forget that we had to coax the `maven-jar-plugin` NOT to include the `sub-bundle` packages in # the root bundle: Added: aries/trunk/cdi/cdi-itests/bnd/tb4-beans.xml URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/bnd/tb4-beans.xml?rev=1784899&view=auto ============================================================================== --- aries/trunk/cdi/cdi-itests/bnd/tb4-beans.xml (added) +++ aries/trunk/cdi/cdi-itests/bnd/tb4-beans.xml Wed Mar 1 10:07:14 2017 @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<cdi:beans xmlns:cdi="http://www.osgi.org/xmlns/cdi/v1.0.0";> + <bean class="org.apache.aries.cdi.test.tb4.CallableImpl"> + <service> + <provide interface="java.util.concurrent.Callable" /> + <property name="a.service.property" value="The Value" type="String"/> + </service> + </bean> +</cdi:beans> \ No newline at end of file Added: aries/trunk/cdi/cdi-itests/bnd/tb4.bnd URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/bnd/tb4.bnd?rev=1784899&view=auto ============================================================================== --- aries/trunk/cdi/cdi-itests/bnd/tb4.bnd (added) +++ aries/trunk/cdi/cdi-itests/bnd/tb4.bnd Wed Mar 1 10:07:14 2017 @@ -0,0 +1,3 @@ +Export-Package: ${p}.tb4.* +Require-Capability: osgi.extender;filter:='(osgi.extender=osgi.cdi)' +-includeresource: OSGI-INF/cdi/osgi-beans.xml=bnd/tb4-beans.xml \ No newline at end of file Modified: aries/trunk/cdi/cdi-itests/itest.bndrun URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/itest.bndrun?rev=1784899&r1=1784898&r2=1784899&view=diff ============================================================================== --- aries/trunk/cdi/cdi-itests/itest.bndrun (original) +++ aries/trunk/cdi/cdi-itests/itest.bndrun Wed Mar 1 10:07:14 2017 @@ -15,12 +15,15 @@ osgi.identity;filter:='(osgi.identity=slf4j.log4j12)' -runbundles: \ - jboss-classfilewriter;version='[1.1.2,1.1.3)',\ + jboss-classfilewriter;version='[1.2.1,1.2.2)',\ log4j;version='[1.2.17,1.2.18)',\ org.apache.aries.cdi.extender;version='[0.0.1,0.0.2)',\ org.apache.aries.cdi.extension.jndi;version='[0.0.1,0.0.2)',\ org.apache.aries.cdi.itests;version='[0.0.1,0.0.2)',\ - org.apache.aries.el-api;version='[0.0.1,0.0.2)',\ + org.apache.aries.javax.cdi-api;version='[0.0.1,0.0.2)',\ + org.apache.aries.javax.el-api;version='[0.0.1,0.0.2)',\ + org.apache.aries.javax.inject-api;version='[0.0.1,0.0.2)',\ + org.apache.aries.javax.interceptor-api;version='[0.0.1,0.0.2)',\ org.apache.aries.jndi.api;version='[1.1.0,1.1.1)',\ org.apache.aries.jndi.core;version='[1.0.2,1.0.3)',\ org.apache.aries.util;version='[1.0.0,1.0.1)',\ @@ -29,10 +32,8 @@ org.apache.felix.gogo.runtime;version='[1.0.2,1.0.3)',\ org.apache.felix.gogo.shell;version='[1.0.0,1.0.1)',\ org.apache.felix.scr;version='[2.0.6,2.0.7)',\ - org.apache.logging.log4j.api;version='[2.7.0,2.7.1)',\ - org.jboss.logging.jboss-logging;version='[3.2.1,3.2.2)',\ - org.jboss.spec.javax.annotation.jboss-annotations-api_1.2_spec;version='[1.0.0,1.0.1)',\ - org.jboss.spec.javax.interceptor.jboss-interceptors-api_1.2_spec;version='[1.0.0,1.0.1)',\ + org.apache.geronimo.specs.geronimo-annotation_1.2_spec;version='[1.0.0,1.0.1)',\ + org.jboss.logging.jboss-logging;version='[3.3.0,3.3.1)',\ org.jboss.weld.osgi-bundle;version='[2.4.0,2.4.1)',\ org.osgi.service.cdi;version='[1.0.0,1.0.1)',\ osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ Modified: aries/trunk/cdi/cdi-itests/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/pom.xml?rev=1784899&r1=1784898&r2=1784899&view=diff ============================================================================== --- aries/trunk/cdi/cdi-itests/pom.xml (original) +++ aries/trunk/cdi/cdi-itests/pom.xml Wed Mar 1 10:07:14 2017 @@ -76,12 +76,6 @@ <groupId>org.apache.aries.cdi</groupId> <artifactId>org.apache.aries.cdi.extender</artifactId> <version>0.0.1-SNAPSHOT</version> - <exclusions> - <exclusion> - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.aries.cdi</groupId> @@ -89,16 +83,6 @@ <version>0.0.1-SNAPSHOT</version> </dependency> <dependency> - <groupId>org.apache.aries.cdi</groupId> - <artifactId>org.apache.aries.el-api</artifactId> - <version>0.0.1-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.aries.jndi</groupId> - <artifactId>org.apache.aries.jndi.api</artifactId> - <version>1.1.0</version> - </dependency> - <dependency> <groupId>org.apache.aries.jndi</groupId> <artifactId>org.apache.aries.jndi.core</artifactId> <version>1.0.2</version> @@ -139,11 +123,26 @@ <version>2.0.6</version> </dependency> <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-annotation_1.2_spec</artifactId> + <version>1.0</version> + </dependency> + <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> <version>2.7</version> </dependency> <dependency> + <groupId>org.jboss.classfilewriter</groupId> + <artifactId>jboss-classfilewriter</artifactId> + <version>1.2.1.Final</version> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging</artifactId> + <version>3.3.0.Final</version> + </dependency> + <dependency> <groupId>org.osgi</groupId> <artifactId>org.eclipse.equinox.metatype</artifactId> <version>1.4.100.v20150408-1437</version> Added: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb4/CallableImpl.java URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb4/CallableImpl.java?rev=1784899&view=auto ============================================================================== --- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb4/CallableImpl.java (added) +++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb4/CallableImpl.java Wed Mar 1 10:07:14 2017 @@ -0,0 +1,12 @@ +package org.apache.aries.cdi.test.tb4; + +import java.util.concurrent.Callable; + +public class CallableImpl implements Callable<String> { + + @Override + public String call() throws Exception { + return getClass().getName(); + } + +} Added: aries/trunk/cdi/javax.cdi-api/LICENSE URL: http://svn.apache.org/viewvc/aries/trunk/cdi/javax.cdi-api/LICENSE?rev=1784899&view=auto ============================================================================== --- aries/trunk/cdi/javax.cdi-api/LICENSE (added) +++ aries/trunk/cdi/javax.cdi-api/LICENSE Wed Mar 1 10:07:14 2017 @@ -0,0 +1,203 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. + Added: aries/trunk/cdi/javax.cdi-api/NOTICE URL: http://svn.apache.org/viewvc/aries/trunk/cdi/javax.cdi-api/NOTICE?rev=1784899&view=auto ============================================================================== --- aries/trunk/cdi/javax.cdi-api/NOTICE (added) +++ aries/trunk/cdi/javax.cdi-api/NOTICE Wed Mar 1 10:07:14 2017 @@ -0,0 +1,8 @@ + +Apache Aries +Copyright 2009-2011 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + + Added: aries/trunk/cdi/javax.cdi-api/bnd.bnd URL: http://svn.apache.org/viewvc/aries/trunk/cdi/javax.cdi-api/bnd.bnd?rev=1784899&view=auto ============================================================================== --- aries/trunk/cdi/javax.cdi-api/bnd.bnd (added) +++ aries/trunk/cdi/javax.cdi-api/bnd.bnd Wed Mar 1 10:07:14 2017 @@ -0,0 +1,11 @@ +Export-Package: \ + javax.decorator,\ + javax.enterprise.* +Import-Package: org.apache.aries.cdi.provider;version='[0.0.1,2.0.0)',* +Provide-Capability: \ + osgi.contract; \ + osgi.contract=JavaCDI; \ + uses:="javax.decorator,javax.enterprise.context,javax.enterprise.context.spi,javax.enterprise.event,javax.enterprise.inject,javax.enterprise.inject.spi,javax.enterprise.util"; \ + version:List<Version>='1.0,1.1,1.2' +-contract: JavaEL, JavaInject, JavaInterceptor +-includeresource: META-INF/=LICENSE, META-INF/=NOTICE \ No newline at end of file Added: aries/trunk/cdi/javax.cdi-api/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/cdi/javax.cdi-api/pom.xml?rev=1784899&view=auto ============================================================================== --- aries/trunk/cdi/javax.cdi-api/pom.xml (added) +++ aries/trunk/cdi/javax.cdi-api/pom.xml Wed Mar 1 10:07:14 2017 @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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.cdi</groupId> + <artifactId>org.apache.aries.cdi</artifactId> + <version>0.0.1-SNAPSHOT</version> + <relativePath>..</relativePath> + </parent> + + <artifactId>org.apache.aries.javax.cdi-api</artifactId> + <version>0.0.1-SNAPSHOT</version> + <name>Javax CDI API Bundle</name> + <description>Javax CDI API Bundle</description> + + <build> + <plugins> + <plugin> + <groupId>biz.aQute.bnd</groupId> + <artifactId>bnd-maven-plugin</artifactId> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + <version>1.2</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>javax.el</groupId> + <artifactId>javax.el-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + </exclusion> + <exclusion> + <groupId>javax.interceptor</groupId> + <artifactId>javax.interceptor-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.aries.cdi</groupId> + <artifactId>org.apache.aries.javax.el-api</artifactId> + <version>0.0.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.aries.cdi</groupId> + <artifactId>org.apache.aries.javax.inject-api</artifactId> + <version>0.0.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.aries.cdi</groupId> + <artifactId>org.apache.aries.javax.interceptor-api</artifactId> + <version>0.0.1-SNAPSHOT</version> + </dependency> + </dependencies> + +</project> Copied: aries/trunk/cdi/javax.cdi-api/src/main/resources/META-INF/services/javax.enterprise.inject.spi.CDIProvider (from r1784898, aries/trunk/cdi/cdi-extender/src/main/resources/META-INF/services/javax.enterprise.inject.spi.CDIProvider) URL: http://svn.apache.org/viewvc/aries/trunk/cdi/javax.cdi-api/src/main/resources/META-INF/services/javax.enterprise.inject.spi.CDIProvider?p2=aries/trunk/cdi/javax.cdi-api/src/main/resources/META-INF/services/javax.enterprise.inject.spi.CDIProvider&p1=aries/trunk/cdi/cdi-extender/src/main/resources/META-INF/services/javax.enterprise.inject.spi.CDIProvider&r1=1784898&r2=1784899&rev=1784899&view=diff ============================================================================== (empty) Copied: aries/trunk/cdi/javax.el-api/bnd.bnd (from r1784898, aries/trunk/cdi/el-api/bnd.bnd) URL: http://svn.apache.org/viewvc/aries/trunk/cdi/javax.el-api/bnd.bnd?p2=aries/trunk/cdi/javax.el-api/bnd.bnd&p1=aries/trunk/cdi/el-api/bnd.bnd&r1=1784898&r2=1784899&rev=1784899&view=diff ============================================================================== (empty) Copied: aries/trunk/cdi/javax.el-api/pom.xml (from r1784898, aries/trunk/cdi/el-api/pom.xml) URL: http://svn.apache.org/viewvc/aries/trunk/cdi/javax.el-api/pom.xml?p2=aries/trunk/cdi/javax.el-api/pom.xml&p1=aries/trunk/cdi/el-api/pom.xml&r1=1784898&r2=1784899&rev=1784899&view=diff ============================================================================== --- aries/trunk/cdi/el-api/pom.xml (original) +++ aries/trunk/cdi/javax.el-api/pom.xml Wed Mar 1 10:07:14 2017 @@ -13,10 +13,10 @@ <relativePath>..</relativePath> </parent> - <artifactId>org.apache.aries.el-api</artifactId> + <artifactId>org.apache.aries.javax.el-api</artifactId> <version>0.0.1-SNAPSHOT</version> - <name>EL API Bundle</name> - <description>EL API Bundle</description> + <name>Javax EL API Bundle</name> + <description>Javax EL API Bundle</description> <build> <plugins> Added: aries/trunk/cdi/javax.inject-api/LICENSE URL: http://svn.apache.org/viewvc/aries/trunk/cdi/javax.inject-api/LICENSE?rev=1784899&view=auto ============================================================================== --- aries/trunk/cdi/javax.inject-api/LICENSE (added) +++ aries/trunk/cdi/javax.inject-api/LICENSE Wed Mar 1 10:07:14 2017 @@ -0,0 +1,203 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. + Added: aries/trunk/cdi/javax.inject-api/NOTICE URL: http://svn.apache.org/viewvc/aries/trunk/cdi/javax.inject-api/NOTICE?rev=1784899&view=auto ============================================================================== --- aries/trunk/cdi/javax.inject-api/NOTICE (added) +++ aries/trunk/cdi/javax.inject-api/NOTICE Wed Mar 1 10:07:14 2017 @@ -0,0 +1,8 @@ + +Apache Aries +Copyright 2009-2011 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + + Added: aries/trunk/cdi/javax.inject-api/bnd.bnd URL: http://svn.apache.org/viewvc/aries/trunk/cdi/javax.inject-api/bnd.bnd?rev=1784899&view=auto ============================================================================== --- aries/trunk/cdi/javax.inject-api/bnd.bnd (added) +++ aries/trunk/cdi/javax.inject-api/bnd.bnd Wed Mar 1 10:07:14 2017 @@ -0,0 +1,9 @@ +Export-Package: \ + javax.inject;version='1.0.0' +Provide-Capability: \ + osgi.contract; \ + osgi.contract=JavaInject; \ + uses:="javax.inject"; \ + version:Version='1' + +-includeresource: META-INF/=LICENSE, META-INF/=NOTICE \ No newline at end of file Copied: aries/trunk/cdi/javax.inject-api/pom.xml (from r1784898, aries/trunk/cdi/el-api/pom.xml) URL: http://svn.apache.org/viewvc/aries/trunk/cdi/javax.inject-api/pom.xml?p2=aries/trunk/cdi/javax.inject-api/pom.xml&p1=aries/trunk/cdi/el-api/pom.xml&r1=1784898&r2=1784899&rev=1784899&view=diff ============================================================================== --- aries/trunk/cdi/el-api/pom.xml (original) +++ aries/trunk/cdi/javax.inject-api/pom.xml Wed Mar 1 10:07:14 2017 @@ -13,10 +13,10 @@ <relativePath>..</relativePath> </parent> - <artifactId>org.apache.aries.el-api</artifactId> + <artifactId>org.apache.aries.javax.inject-api</artifactId> <version>0.0.1-SNAPSHOT</version> - <name>EL API Bundle</name> - <description>EL API Bundle</description> + <name>Javax Inject API Bundle</name> + <description>Javax Inject API Bundle</description> <build> <plugins> @@ -29,9 +29,9 @@ <dependencies> <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-el-api</artifactId> - <version>8.0.41</version> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + <version>1</version> <scope>provided</scope> </dependency> </dependencies> Added: aries/trunk/cdi/javax.interceptor-api/LICENSE URL: http://svn.apache.org/viewvc/aries/trunk/cdi/javax.interceptor-api/LICENSE?rev=1784899&view=auto ============================================================================== --- aries/trunk/cdi/javax.interceptor-api/LICENSE (added) +++ aries/trunk/cdi/javax.interceptor-api/LICENSE Wed Mar 1 10:07:14 2017 @@ -0,0 +1,203 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. + Added: aries/trunk/cdi/javax.interceptor-api/NOTICE URL: http://svn.apache.org/viewvc/aries/trunk/cdi/javax.interceptor-api/NOTICE?rev=1784899&view=auto ============================================================================== --- aries/trunk/cdi/javax.interceptor-api/NOTICE (added) +++ aries/trunk/cdi/javax.interceptor-api/NOTICE Wed Mar 1 10:07:14 2017 @@ -0,0 +1,8 @@ + +Apache Aries +Copyright 2009-2011 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + + Added: aries/trunk/cdi/javax.interceptor-api/bnd.bnd URL: http://svn.apache.org/viewvc/aries/trunk/cdi/javax.interceptor-api/bnd.bnd?rev=1784899&view=auto ============================================================================== --- aries/trunk/cdi/javax.interceptor-api/bnd.bnd (added) +++ aries/trunk/cdi/javax.interceptor-api/bnd.bnd Wed Mar 1 10:07:14 2017 @@ -0,0 +1,8 @@ +Export-Package: \ + javax.interceptor +Provide-Capability: \ + osgi.contract; \ + osgi.contract=JavaInterceptor; \ + uses:="javax.interceptor"; \ + version:List<Version>='1.1,1.2' +-includeresource: @geronimo-interceptor_*.jar!/META-INF/LICENSE, @geronimo-interceptor_*.jar!/META-INF/NOTICE \ No newline at end of file Copied: aries/trunk/cdi/javax.interceptor-api/pom.xml (from r1784898, aries/trunk/cdi/el-api/pom.xml) URL: http://svn.apache.org/viewvc/aries/trunk/cdi/javax.interceptor-api/pom.xml?p2=aries/trunk/cdi/javax.interceptor-api/pom.xml&p1=aries/trunk/cdi/el-api/pom.xml&r1=1784898&r2=1784899&rev=1784899&view=diff ============================================================================== --- aries/trunk/cdi/el-api/pom.xml (original) +++ aries/trunk/cdi/javax.interceptor-api/pom.xml Wed Mar 1 10:07:14 2017 @@ -13,10 +13,10 @@ <relativePath>..</relativePath> </parent> - <artifactId>org.apache.aries.el-api</artifactId> + <artifactId>org.apache.aries.javax.interceptor-api</artifactId> <version>0.0.1-SNAPSHOT</version> - <name>EL API Bundle</name> - <description>EL API Bundle</description> + <name>Javax Interceptor API Bundle</name> + <description>Javax Interceptor API Bundle</description> <build> <plugins> @@ -29,9 +29,9 @@ <dependencies> <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-el-api</artifactId> - <version>8.0.41</version> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-interceptor_1.2_spec</artifactId> + <version>1.0</version> <scope>provided</scope> </dependency> </dependencies> Modified: aries/trunk/cdi/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/cdi/pom.xml?rev=1784899&r1=1784898&r2=1784899&view=diff ============================================================================== --- aries/trunk/cdi/pom.xml (original) +++ aries/trunk/cdi/pom.xml Wed Mar 1 10:07:14 2017 @@ -24,7 +24,10 @@ </licenses> <modules> - <module>el-api</module> + <module>javax.el-api</module> + <module>javax.inject-api</module> + <module>javax.interceptor-api</module> + <module>javax.cdi-api</module> <module>cdi-extender</module> <module>cdi-extension-jndi</module> <module>cdi-itests</module>
