Fix license issue
Update changelog
Upgrade some settings in the configuration test suite
Add the obr.xml file for the web console plugin
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk/ipojo/composite@795564 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/LICENSE.asm b/LICENSE.asm
index 9496b17..cc529ed 100644
--- a/LICENSE.asm
+++ b/LICENSE.asm
@@ -1,28 +1,29 @@
+Copyright (c) 2000-2005 INRIA, France Telecom
+All rights reserved.
- ASM: a very small and fast Java bytecode manipulation framework
- Copyright (c) 2000-2005 INRIA, France Telecom
- All rights reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- 3. Neither the name of the copyright holders nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- THE POSSIBILITY OF SUCH DAMAGE.
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holders nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/NOTICE b/NOTICE
index e833af7..21f4bfa 100644
--- a/NOTICE
+++ b/NOTICE
@@ -24,4 +24,4 @@
III. License Summary
- Apache License 2.0
-- BSD Licence
+- BSD License
diff --git a/doc/changelog.txt b/doc/changelog.txt
index 63ee888..043835e 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -1,3 +1,12 @@
+Changes from 1.2.0 to 1.4.0
+---------------------------
+** Bug
+ * [FELIX-994] - ClassCastException while Architecture on a composite with a provided service
+
+** Improvement
+ * Update parent pom
+
+
Changes from 1.0.0 to 1.2.0
---------------------------
** Bug
diff --git a/pom.xml b/pom.xml
index 94e52f5..919751e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,144 +1,149 @@
<!--
- 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
+ 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.
+ 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">
- <parent>
- <groupId>org.apache.felix</groupId>
- <artifactId>felix-parent</artifactId>
- <version>1.2.0</version>
- <relativePath>../../pom/pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>bundle</packaging>
- <name>Apache Felix iPOJO Composite</name>
- <artifactId>org.apache.felix.ipojo.composite</artifactId>
- <groupId>org.apache.felix</groupId>
- <version>1.3.0-SNAPSHOT</version>
+ <parent>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>felix-parent</artifactId>
+ <version>1.2.0</version>
+ <relativePath>../../pom/pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>bundle</packaging>
+ <name>Apache Felix iPOJO Composite</name>
+ <artifactId>org.apache.felix.ipojo.composite</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <version>1.3.0-SNAPSHOT</version>
- <properties>
- <ipojo.package.version>1.4.0</ipojo.package.version>
- </properties>
+ <properties>
+ <ipojo.package.version>1.4.0</ipojo.package.version>
+ </properties>
+
+ <description>
+ iPOJO Compoistion Model. This is an iPOJO extension to execute service composition.
+ </description>
+ <url>http://felix.apache.org/site/ipojo-composition-tutorial.html</url>
- <dependencies>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.manipulator</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo</artifactId>
- <version>${pom.version}</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Name>Apache Felix iPOJO Composite</Bundle-Name>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Bundle-Vendor> The Apache Software Foundation </Bundle-Vendor>
- <Bundle-Description> iPOJO Composititon Framework
- </Bundle-Description>
- <Bundle-DocURL>
- http://felix.apache.org/site/apache-felix-ipojo.html
- </Bundle-DocURL>
- <Import-Package>
- org.apache.felix.ipojo,
- org.apache.felix.ipojo.architecture,
- org.apache.felix.ipojo.context,
- org.apache.felix.ipojo.metadata,
- org.apache.felix.ipojo.parser,
- org.apache.felix.ipojo.util,
- org.osgi.framework;version=1.3 </Import-Package>
- <Private-Package>
- org.apache.felix.ipojo.composite.architecture,
- org.apache.felix.ipojo.composite.service*,
- org.apache.felix.ipojo.composite.instance,
- org.apache.felix.ipojo.composite.util
- </Private-Package>
- <Export-Package>
- org.apache.felix.ipojo.composite; version="${ipojo.package.version}" ,
- !org.objectweb.asm.xml*,
- org.objectweb.asm*;-split-package:=merge-first ,
- org.apache.felix.ipojo.manipulation
- </Export-Package>
- <Include-Resource> META-INF/LICENSE=LICENSE,
- META-INF/NOTICE=NOTICE, META-INF/LICENSE.asm=LICENSE.asm
- </Include-Resource>
- <IPOJO-Extension>
- composite:org.apache.felix.ipojo.composite.CompositeFactory
- </IPOJO-Extension>
- <_donotcopy> (CVS|.svn|.+.bak|~.+|metadata.xml) </_donotcopy>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-ipojo-plugin</artifactId>
- <version>${pom.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>ipojo-bundle</goal>
- </goals>
- <configuration>
- <metadata>metadata.xml</metadata>
- <ignoreAnnotations>true</ignoreAnnotations>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <configuration>
- <excludeSubProjects>false</excludeSubProjects>
- <useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
- <useMavenDefaultExcludes>true</useMavenDefaultExcludes>
- <excludes>
- <param>doc/**/*</param>
- <param>maven-eclipse.xml</param>
- <param>.checkstyle</param>
- <param>.externalToolBuilders/*</param>
- <param>LICENSE.asm</param>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <enableRulesSummary>false</enableRulesSummary>
- <violationSeverity>warning</violationSeverity>
- <configLocation>http://felix.apache.org/ipojo/dev/checkstyle_ipojo.xml</configLocation>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo.manipulator</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.4.3</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-Name>Apache Felix iPOJO Composite</Bundle-Name>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-Vendor> The Apache Software Foundation </Bundle-Vendor>
+ <Bundle-Description> iPOJO Composititon Framework
+ </Bundle-Description>
+ <Bundle-DocURL>
+ http://felix.apache.org/site/ipojo-composition-tutorial.html
+ </Bundle-DocURL>
+ <Import-Package>
+ org.apache.felix.ipojo,
+ org.apache.felix.ipojo.architecture,
+ org.apache.felix.ipojo.context,
+ org.apache.felix.ipojo.metadata,
+ org.apache.felix.ipojo.parser,
+ org.apache.felix.ipojo.util,
+ org.osgi.framework;version=1.3 </Import-Package>
+ <Private-Package>
+ org.apache.felix.ipojo.composite.architecture,
+ org.apache.felix.ipojo.composite.service*,
+ org.apache.felix.ipojo.composite.instance,
+ org.apache.felix.ipojo.composite.util
+ </Private-Package>
+ <Export-Package>
+ org.apache.felix.ipojo.composite; version="${ipojo.package.version}" ,
+ !org.objectweb.asm.xml*,
+ org.objectweb.asm*;-split-package:=merge-first ,
+ org.apache.felix.ipojo.manipulation
+ </Export-Package>
+ <Include-Resource> META-INF/LICENSE=LICENSE,
+ META-INF/NOTICE=NOTICE, META-INF/LICENSE.asm=LICENSE.asm
+ </Include-Resource>
+ <IPOJO-Extension>
+ composite:org.apache.felix.ipojo.composite.CompositeFactory
+ </IPOJO-Extension>
+ <_donotcopy> (CVS|.svn|.+.bak|~.+|metadata.xml) </_donotcopy>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-ipojo-plugin</artifactId>
+ <version>${pom.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>ipojo-bundle</goal>
+ </goals>
+ <configuration>
+ <metadata>metadata.xml</metadata>
+ <ignoreAnnotations>true</ignoreAnnotations>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
+ <useMavenDefaultExcludes>true</useMavenDefaultExcludes>
+ <excludes>
+ <param>doc/**/*</param>
+ <param>maven-eclipse.xml</param>
+ <param>.checkstyle</param>
+ <param>.externalToolBuilders/*</param>
+ <param>LICENSE.asm</param>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <enableRulesSummary>false</enableRulesSummary>
+ <violationSeverity>warning</violationSeverity>
+ <configLocation>http://felix.apache.org/ipojo/dev/checkstyle_ipojo.xml</configLocation>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
