You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cl...@apache.org on 2011/12/06 16:04:45 UTC
svn commit: r1210959 - in /felix/trunk/ipojo/manipulator: ./
bnd-ipojo-plugin/ bnd-ipojo-plugin/doc/ doc/ ipojo-ant-task/
ipojo-ant-task/doc/ manipulator/ manipulator/doc/
manipulator/src/test/java/org/apache/felix/ipojo/
manipulator/src/test/java/org/...
Author: clement
Date: Tue Dec 6 15:04:44 2011
New Revision: 1210959
URL: http://svn.apache.org/viewvc?rev=1210959&view=rev
Log:
Prepare for the next release:
* Added missing license header
* Updatee changelogs
* Fixed build
* Added LICENSE, NOTICE and DEPENDENCIES files
Added:
felix/trunk/ipojo/manipulator/bnd-ipojo-plugin/DEPENDENCIES
felix/trunk/ipojo/manipulator/bnd-ipojo-plugin/LICENSE
felix/trunk/ipojo/manipulator/bnd-ipojo-plugin/NOTICE
felix/trunk/ipojo/manipulator/bnd-ipojo-plugin/doc/
felix/trunk/ipojo/manipulator/bnd-ipojo-plugin/doc/changelog.txt
felix/trunk/ipojo/manipulator/doc/
felix/trunk/ipojo/manipulator/doc/changelog.txt
Modified:
felix/trunk/ipojo/manipulator/DEPENDENCIES
felix/trunk/ipojo/manipulator/NOTICE
felix/trunk/ipojo/manipulator/bnd-ipojo-plugin/pom.xml
felix/trunk/ipojo/manipulator/ipojo-ant-task/doc/changelog.txt
felix/trunk/ipojo/manipulator/ipojo-ant-task/pom.xml
felix/trunk/ipojo/manipulator/manipulator/doc/changelog.txt
felix/trunk/ipojo/manipulator/manipulator/pom.xml
felix/trunk/ipojo/manipulator/manipulator/src/test/java/org/apache/felix/ipojo/ComponentInstance.java
felix/trunk/ipojo/manipulator/manipulator/src/test/java/org/apache/felix/ipojo/InstanceManager.java
felix/trunk/ipojo/manipulator/manipulator/src/test/java/org/apache/felix/ipojo/Pojo.java
felix/trunk/ipojo/manipulator/manipulator/src/test/java/org/apache/felix/ipojo/manipulation/ManipulatorTest.java
felix/trunk/ipojo/manipulator/manipulator/src/test/java/org/apache/felix/ipojo/manipulation/PojoizationTest.java
felix/trunk/ipojo/manipulator/manipulator/src/test/java/test/AnnotatedComponent.java
felix/trunk/ipojo/manipulator/manipulator/src/test/java/test/Child.java
felix/trunk/ipojo/manipulator/manipulator/src/test/java/test/ClusterDaemon.java
felix/trunk/ipojo/manipulator/manipulator/src/test/java/test/ConstructorCheck.java
felix/trunk/ipojo/manipulator/manipulator/src/test/java/test/NoValidConstructor.java
felix/trunk/ipojo/manipulator/manipulator/src/test/java/test/Parent.java
felix/trunk/ipojo/manipulator/manipulator/src/test/java/test/PojoWithInner.java
felix/trunk/ipojo/manipulator/manipulator/src/test/java/test/SimplePojo.java
felix/trunk/ipojo/manipulator/maven-ipojo-plugin/doc/changelog.txt
felix/trunk/ipojo/manipulator/maven-ipojo-plugin/pom.xml
felix/trunk/ipojo/manipulator/pom.xml
Modified: felix/trunk/ipojo/manipulator/DEPENDENCIES
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/DEPENDENCIES?rev=1210959&r1=1210958&r2=1210959&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/DEPENDENCIES (original)
+++ felix/trunk/ipojo/manipulator/DEPENDENCIES Tue Dec 6 15:04:44 2011
@@ -1,4 +1,4 @@
-Apache Felix iPOJO Manipulator
+Apache Felix iPOJO Manipulator Project
Copyright 2008-2011 The Apache Software Foundation
This software was developed at the Apache Software Foundation
@@ -13,6 +13,15 @@ Licensed under BSD License.
II. Used Third-Party Software
+This product uses software developed by Peter Kriens
+(http://www.aqute.biz/Code/Bnd)
+Copyright 2006-2011 aQute, All rights reserved
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+The Codehaus (http://www.codehaus.org)
+Licensed under the Apache License 2.0.
+
III. Overall License Summary
- Apache License 2.0
- BSD License
Modified: felix/trunk/ipojo/manipulator/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/NOTICE?rev=1210959&r1=1210958&r2=1210959&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/NOTICE (original)
+++ felix/trunk/ipojo/manipulator/NOTICE Tue Dec 6 15:04:44 2011
@@ -1,4 +1,4 @@
-Apache Felix iPOJO Manipulator
+Apache Felix iPOJO Manipulator Project
Copyright 2008-2011 The Apache Software Foundation
This product includes software developed at
Added: felix/trunk/ipojo/manipulator/bnd-ipojo-plugin/DEPENDENCIES
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/bnd-ipojo-plugin/DEPENDENCIES?rev=1210959&view=auto
==============================================================================
--- felix/trunk/ipojo/manipulator/bnd-ipojo-plugin/DEPENDENCIES (added)
+++ felix/trunk/ipojo/manipulator/bnd-ipojo-plugin/DEPENDENCIES Tue Dec 6 15:04:44 2011
@@ -0,0 +1,18 @@
+Apache Felix BND iPOJO Plugin
+Copyright 2008-2011 The Apache Software Foundation
+
+This software was developed at the Apache Software Foundation
+(http://www.apache.org) and may have dependencies on other
+Apache software licensed under Apache License 2.0.
+
+I. Included Third-Party Software
+
+II. Used Third-Party Software
+
+This product uses software developed by Peter Kriens
+(http://www.aqute.biz/Code/Bnd)
+Copyright 2006-2011 aQute, All rights reserved
+Licensed under the Apache License 2.0.
+
+III. Overall License Summary
+- Apache License 2.0
Added: felix/trunk/ipojo/manipulator/bnd-ipojo-plugin/LICENSE
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/bnd-ipojo-plugin/LICENSE?rev=1210959&view=auto
==============================================================================
--- felix/trunk/ipojo/manipulator/bnd-ipojo-plugin/LICENSE (added)
+++ felix/trunk/ipojo/manipulator/bnd-ipojo-plugin/LICENSE Tue Dec 6 15:04:44 2011
@@ -0,0 +1,202 @@
+
+ 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: felix/trunk/ipojo/manipulator/bnd-ipojo-plugin/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/bnd-ipojo-plugin/NOTICE?rev=1210959&view=auto
==============================================================================
--- felix/trunk/ipojo/manipulator/bnd-ipojo-plugin/NOTICE (added)
+++ felix/trunk/ipojo/manipulator/bnd-ipojo-plugin/NOTICE Tue Dec 6 15:04:44 2011
@@ -0,0 +1,6 @@
+Apache Felix BND iPOJO Plugin
+Copyright 2008-2011 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
Added: felix/trunk/ipojo/manipulator/bnd-ipojo-plugin/doc/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/bnd-ipojo-plugin/doc/changelog.txt?rev=1210959&view=auto
==============================================================================
--- felix/trunk/ipojo/manipulator/bnd-ipojo-plugin/doc/changelog.txt (added)
+++ felix/trunk/ipojo/manipulator/bnd-ipojo-plugin/doc/changelog.txt Tue Dec 6 15:04:44 2011
@@ -0,0 +1,18 @@
+Changes in the 1.8.2
+--------------------
+
+** Bug
+ * [FELIX-2825] - The maven-ipojo-plugin does not replace component classes in WAR files
+ * [FELIX-3012] - "Duplicate name&signature" problem
+ * [FELIX-3098] - iPOJO new manipulator crashes when using a custom reporter
+ * [FELIX-3145] - VerifyError on Java 7
+ * [FELIX-3249] - iPOJO Bnd Plugin do not write all the metadatas in the manifest
+
+** Improvement
+ * [FELIX-3017] - The manipulator should return the original class if it's already manipulated
+ * [FELIX-3078] - Introduce resource abstraction in the iPOJO manipulator
+ * [FELIX-3079] - Adapt the Ant task and the maven plugin to use the new manipulator capabilities
+ * [FELIX-3080] - Implement a BND plugin for iPOJO
+ * [FELIX-3131] - Elements and attributes should conserve the insertion order
+ * [FELIX-3204] - @Temporal should handle instantiation-time properties
+ * [FELIX-3244] - Manipulator : DefaultManifestBuilder should be more extensible
\ No newline at end of file
Modified: felix/trunk/ipojo/manipulator/bnd-ipojo-plugin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/bnd-ipojo-plugin/pom.xml?rev=1210959&r1=1210958&r2=1210959&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/bnd-ipojo-plugin/pom.xml (original)
+++ felix/trunk/ipojo/manipulator/bnd-ipojo-plugin/pom.xml Tue Dec 6 15:04:44 2011
@@ -69,4 +69,26 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
\ No newline at end of file
Added: felix/trunk/ipojo/manipulator/doc/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/doc/changelog.txt?rev=1210959&view=auto
==============================================================================
--- felix/trunk/ipojo/manipulator/doc/changelog.txt (added)
+++ felix/trunk/ipojo/manipulator/doc/changelog.txt Tue Dec 6 15:04:44 2011
@@ -0,0 +1,18 @@
+Changes in the 1.8.2
+--------------------
+
+** Bug
+ * [FELIX-2825] - The maven-ipojo-plugin does not replace component classes in WAR files
+ * [FELIX-3012] - "Duplicate name&signature" problem
+ * [FELIX-3098] - iPOJO new manipulator crashes when using a custom reporter
+ * [FELIX-3145] - VerifyError on Java 7
+ * [FELIX-3249] - iPOJO Bnd Plugin do not write all the metadatas in the manifest
+
+** Improvement
+ * [FELIX-3017] - The manipulator should return the original class if it's already manipulated
+ * [FELIX-3078] - Introduce resource abstraction in the iPOJO manipulator
+ * [FELIX-3079] - Adapt the Ant task and the maven plugin to use the new manipulator capabilities
+ * [FELIX-3080] - Implement a BND plugin for iPOJO
+ * [FELIX-3131] - Elements and attributes should conserve the insertion order
+ * [FELIX-3204] - @Temporal should handle instantiation-time properties
+ * [FELIX-3244] - Manipulator : DefaultManifestBuilder should be more extensible
\ No newline at end of file
Modified: felix/trunk/ipojo/manipulator/ipojo-ant-task/doc/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/ipojo-ant-task/doc/changelog.txt?rev=1210959&r1=1210958&r2=1210959&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/ipojo-ant-task/doc/changelog.txt (original)
+++ felix/trunk/ipojo/manipulator/ipojo-ant-task/doc/changelog.txt Tue Dec 6 15:04:44 2011
@@ -1,3 +1,22 @@
+Changes from the 1.8.0 to 1.8.2
+-------------------------------
+
+** Bug
+ * [FELIX-2825] - The maven-ipojo-plugin does not replace component classes in WAR files
+ * [FELIX-3012] - "Duplicate name&signature" problem
+ * [FELIX-3098] - iPOJO new manipulator crashes when using a custom reporter
+ * [FELIX-3145] - VerifyError on Java 7
+ * [FELIX-3249] - iPOJO Bnd Plugin do not write all the metadatas in the manifest
+
+** Improvement
+ * [FELIX-3017] - The manipulator should return the original class if it's already manipulated
+ * [FELIX-3078] - Introduce resource abstraction in the iPOJO manipulator
+ * [FELIX-3079] - Adapt the Ant task and the maven plugin to use the new manipulator capabilities
+ * [FELIX-3080] - Implement a BND plugin for iPOJO
+ * [FELIX-3131] - Elements and attributes should conserve the insertion order
+ * [FELIX-3204] - @Temporal should handle instantiation-time properties
+ * [FELIX-3244] - Manipulator : DefaultManifestBuilder should be more extensible
+
Changes from the 1.6.0 to 1.8.0
-------------------------------
** Improvement
Modified: felix/trunk/ipojo/manipulator/ipojo-ant-task/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/ipojo-ant-task/pom.xml?rev=1210959&r1=1210958&r2=1210959&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/ipojo-ant-task/pom.xml (original)
+++ felix/trunk/ipojo/manipulator/ipojo-ant-task/pom.xml Tue Dec 6 15:04:44 2011
@@ -16,119 +16,144 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <groupId>org.apache.felix</groupId>
- <artifactId>felix-parent</artifactId>
- <version>1.2.1</version>
- <relativePath>../../../pom/pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.apache.felix.ipojo.ant</artifactId>
- <groupId>org.apache.felix</groupId>
- <version>1.9.0-SNAPSHOT</version>
- <packaging>bundle</packaging>
- <name>Apache Felix iPOJO Ant Task</name>
-
- <description>
- Ant task to package iPOJO-powered bundles.
- </description>
- <url>
- http://felix.apache.org/site/ipojo-ant-task.html
- </url>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>1.4.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.manipulator</artifactId>
- <version>1.9.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.9.1</version>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.6.5</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Name>iPOJO Ant Task</Bundle-Name>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Bundle-Vendor> The Apache Software Foundation </Bundle-Vendor>
- <Bundle-Description> iPOJO Ant Task </Bundle-Description>
- <Bundle-DocURL>http://felix.apache.org/site/ipojo-ant-task.html</Bundle-DocURL>
- <Private-Package> org.apache.felix.ipojo.metadata,
- org.apache.felix.ipojo.manipulator*,
- org.apache.felix.ipojo.xml.parser,
- org.apache.felix.ipojo.manipulation*,
- org.objectweb.asm.util;-split-package:=merge-first,
- org.objectweb.asm;-split-package:=merge-first,
- org.objectweb.asm.commons;-split-package:=merge-first,
- org.apache.xerces.parsers, org.apache.xerces.xni*,
- org.apache.xerces.impl*, org.apache.xerces.util.*,
- org.apache.xerces.dom.*, org.apache.xerces.dom3.*
- </Private-Package>
- <Export-Package> org.apache.felix.ipojo.task </Export-Package>
- <Include-Resource>
- META-INF/LICENSE=LICENSE,
- META-INF/NOTICE=NOTICE,
- META-INF/LICENSE.asm=LICENSE.asm,
- META-INF/DEPENDENCIES=DEPENDENCIES
- </Include-Resource>
- <Import-Package>!org.objectweb.asm.signature, !org.objectweb.asm.tree, !org.objectweb.asm.tree.analysis, *</Import-Package>
- </instructions>
- <obrRepository>NONE</obrRepository>
- </configuration>
- </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>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <artifactId>felix-parent</artifactId>
+ <version>1.2.1</version>
+ <relativePath>../../../pom/pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>org.apache.felix.ipojo.ant</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <version>1.9.0-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+ <name>Apache Felix iPOJO Ant Task</name>
+
+ <description>
+ Ant task to package iPOJO-powered bundles.
+ </description>
+ <url>
+ http://felix.apache.org/site/ipojo-ant-task.html
+ </url>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo.metadata</artifactId>
+ <version>1.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo.manipulator</artifactId>
+ <version>1.9.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.9.1</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.6.5</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>iPOJO Ant Task</Bundle-Name>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
+ <Bundle-Description>iPOJO Ant Task</Bundle-Description>
+ <Bundle-DocURL>http://felix.apache.org/site/ipojo-ant-task.html</Bundle-DocURL>
+ <Private-Package>org.apache.felix.ipojo.metadata,
+ org.apache.felix.ipojo.manipulator*,
+ org.apache.felix.ipojo.xml.parser,
+ org.apache.felix.ipojo.manipulation*,
+ org.objectweb.asm.util;-split-package:=merge-first,
+ org.objectweb.asm;-split-package:=merge-first,
+ org.objectweb.asm.commons;-split-package:=merge-first,
+ org.apache.xerces.parsers, org.apache.xerces.xni*,
+ org.apache.xerces.impl*, org.apache.xerces.util.*,
+ org.apache.xerces.dom.*, org.apache.xerces.dom3.*
+ </Private-Package>
+ <Export-Package>org.apache.felix.ipojo.task</Export-Package>
+ <Include-Resource>
+ META-INF/LICENSE=LICENSE,
+ META-INF/NOTICE=NOTICE,
+ META-INF/LICENSE.asm=LICENSE.asm,
+ META-INF/DEPENDENCIES=DEPENDENCIES
+ </Include-Resource>
+ <Import-Package>!org.objectweb.asm.signature, !org.objectweb.asm.tree,
+ !org.objectweb.asm.tree.analysis, *
+ </Import-Package>
+ </instructions>
+ <obrRepository>NONE</obrRepository>
+ </configuration>
+ </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>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: felix/trunk/ipojo/manipulator/manipulator/doc/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator/doc/changelog.txt?rev=1210959&r1=1210958&r2=1210959&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/manipulator/doc/changelog.txt (original)
+++ felix/trunk/ipojo/manipulator/manipulator/doc/changelog.txt Tue Dec 6 15:04:44 2011
@@ -1,8 +1,21 @@
Changes from the 1.8.0 to 1.8.2
-------------------------------
+
** Bug
* [FELIX-2825] - The maven-ipojo-plugin does not replace component classes in WAR files
+ * [FELIX-3012] - "Duplicate name&signature" problem
+ * [FELIX-3098] - iPOJO new manipulator crashes when using a custom reporter
+ * [FELIX-3145] - VerifyError on Java 7
+ * [FELIX-3249] - iPOJO Bnd Plugin do not write all the metadatas in the manifest
+** Improvement
+ * [FELIX-3017] - The manipulator should return the original class if it's already manipulated
+ * [FELIX-3078] - Introduce resource abstraction in the iPOJO manipulator
+ * [FELIX-3079] - Adapt the Ant task and the maven plugin to use the new manipulator capabilities
+ * [FELIX-3080] - Implement a BND plugin for iPOJO
+ * [FELIX-3131] - Elements and attributes should conserve the insertion order
+ * [FELIX-3204] - @Temporal should handle instantiation-time properties
+ * [FELIX-3244] - Manipulator : DefaultManifestBuilder should be more extensible
Changes from the 1.6.4 to 1.8.0
-------------------------------
Modified: felix/trunk/ipojo/manipulator/manipulator/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator/pom.xml?rev=1210959&r1=1210958&r2=1210959&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/manipulator/pom.xml (original)
+++ felix/trunk/ipojo/manipulator/manipulator/pom.xml Tue Dec 6 15:04:44 2011
@@ -16,134 +16,158 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <groupId>org.apache.felix</groupId>
- <artifactId>felix-parent</artifactId>
- <version>1.2.1</version>
- <relativePath>../../../pom/pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>bundle</packaging>
- <artifactId>org.apache.felix.ipojo.manipulator</artifactId>
- <version>1.9.0-SNAPSHOT</version>
- <name>Apache Felix iPOJO Manipulator</name>
-
- <description>
- iPOJO bytecode manipulator. This manipulator is used to instrument java classes in order to be managed by iPOJO.
- </description>
-
- <dependencies>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm-all</artifactId>
- <version>3.3.1</version>
- <exclusions>
- <exclusion>
- <groupId>asm</groupId>
- <artifactId>asm-tree</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>1.6.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.annotations</artifactId>
- <version>1.8.0</version>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.8.5</version>
- <scope>test</scope>
- </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>iPOJO Manipulator</Bundle-Name>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Bundle-Vendor> The Apache Software Foundation </Bundle-Vendor>
- <Bundle-Description> iPOJO Manipulator </Bundle-Description>
- <Export-Package> org.apache.felix.ipojo.manipulator.*
- </Export-Package>
- <Private-Package> org.apache.felix.ipojo.manipulation,
- org.apache.felix.ipojo.manipulation.annotations,
- org.apache.felix.ipojo.xml.parser, org.objectweb.asm,
- org.objectweb.asm.commons </Private-Package>
- <Include-Resource>
- META-INF/LICENSE=LICENSE,
- META-INF/LICENSE.asm=LICENSE.asm,
- META-INF/NOTICE=NOTICE,
- META-INF/DEPENDENCIES=DEPENDENCIES,
- {maven-resources}
- </Include-Resource>
- <Import-Package>!org.objectweb.asm.tree, *</Import-Package>
- </instructions>
- <obrRepository>NONE</obrRepository>
- </configuration>
- </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>
- <param>DEPENDENCIES</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>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
- </plugins>
-
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <directory>.</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>LICENSE*</include>
- <include>NOTICE*</include>
- <include>DEPENDENCIES*</include>
- </includes>
- </resource>
- </resources>
- </build>
+ <artifactId>felix-parent</artifactId>
+ <version>1.2.1</version>
+ <relativePath>../../../pom/pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>bundle</packaging>
+ <artifactId>org.apache.felix.ipojo.manipulator</artifactId>
+ <version>1.9.0-SNAPSHOT</version>
+ <name>Apache Felix iPOJO Manipulator</name>
+
+ <description>
+ iPOJO bytecode manipulator. This manipulator is used to instrument java classes in order to be managed by iPOJO.
+ </description>
+
+ <dependencies>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-all</artifactId>
+ <version>3.3.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm-tree</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo.metadata</artifactId>
+ <version>1.6.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo.annotations</artifactId>
+ <version>1.8.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>1.8.5</version>
+ <scope>test</scope>
+ </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>iPOJO Manipulator</Bundle-Name>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
+ <Bundle-Description>iPOJO Manipulator</Bundle-Description>
+ <Export-Package>org.apache.felix.ipojo.manipulator.*
+ </Export-Package>
+ <Private-Package>org.apache.felix.ipojo.manipulation,
+ org.apache.felix.ipojo.manipulation.annotations,
+ org.apache.felix.ipojo.xml.parser, org.objectweb.asm,
+ org.objectweb.asm.commons
+ </Private-Package>
+ <Include-Resource>
+ META-INF/LICENSE=LICENSE,
+ META-INF/LICENSE.asm=LICENSE.asm,
+ META-INF/NOTICE=NOTICE,
+ META-INF/DEPENDENCIES=DEPENDENCIES,
+ {maven-resources}
+ </Include-Resource>
+ <Import-Package>!org.objectweb.asm.tree, *</Import-Package>
+ </instructions>
+ <obrRepository>NONE</obrRepository>
+ </configuration>
+ </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>
+ <param>DEPENDENCIES</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>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+
+ </plugins>
+
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>.</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ <include>DEPENDENCIES*</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: felix/trunk/ipojo/manipulator/manipulator/src/test/java/org/apache/felix/ipojo/ComponentInstance.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator/src/test/java/org/apache/felix/ipojo/ComponentInstance.java?rev=1210959&r1=1210958&r2=1210959&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/manipulator/src/test/java/org/apache/felix/ipojo/ComponentInstance.java (original)
+++ felix/trunk/ipojo/manipulator/manipulator/src/test/java/org/apache/felix/ipojo/ComponentInstance.java Tue Dec 6 15:04:44 2011
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
package org.apache.felix.ipojo;
Modified: felix/trunk/ipojo/manipulator/manipulator/src/test/java/org/apache/felix/ipojo/InstanceManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator/src/test/java/org/apache/felix/ipojo/InstanceManager.java?rev=1210959&r1=1210958&r2=1210959&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/manipulator/src/test/java/org/apache/felix/ipojo/InstanceManager.java (original)
+++ felix/trunk/ipojo/manipulator/manipulator/src/test/java/org/apache/felix/ipojo/InstanceManager.java Tue Dec 6 15:04:44 2011
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
package org.apache.felix.ipojo;
import java.util.Set;
Modified: felix/trunk/ipojo/manipulator/manipulator/src/test/java/org/apache/felix/ipojo/Pojo.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator/src/test/java/org/apache/felix/ipojo/Pojo.java?rev=1210959&r1=1210958&r2=1210959&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/manipulator/src/test/java/org/apache/felix/ipojo/Pojo.java (original)
+++ felix/trunk/ipojo/manipulator/manipulator/src/test/java/org/apache/felix/ipojo/Pojo.java Tue Dec 6 15:04:44 2011
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
package org.apache.felix.ipojo;
/**
Modified: felix/trunk/ipojo/manipulator/manipulator/src/test/java/org/apache/felix/ipojo/manipulation/ManipulatorTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator/src/test/java/org/apache/felix/ipojo/manipulation/ManipulatorTest.java?rev=1210959&r1=1210958&r2=1210959&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/manipulator/src/test/java/org/apache/felix/ipojo/manipulation/ManipulatorTest.java (original)
+++ felix/trunk/ipojo/manipulator/manipulator/src/test/java/org/apache/felix/ipojo/manipulation/ManipulatorTest.java Tue Dec 6 15:04:44 2011
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
package org.apache.felix.ipojo.manipulation;
import java.io.*;
Modified: felix/trunk/ipojo/manipulator/manipulator/src/test/java/org/apache/felix/ipojo/manipulation/PojoizationTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator/src/test/java/org/apache/felix/ipojo/manipulation/PojoizationTest.java?rev=1210959&r1=1210958&r2=1210959&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/manipulator/src/test/java/org/apache/felix/ipojo/manipulation/PojoizationTest.java (original)
+++ felix/trunk/ipojo/manipulator/manipulator/src/test/java/org/apache/felix/ipojo/manipulation/PojoizationTest.java Tue Dec 6 15:04:44 2011
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
package org.apache.felix.ipojo.manipulation;
import java.io.File;
Modified: felix/trunk/ipojo/manipulator/manipulator/src/test/java/test/AnnotatedComponent.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator/src/test/java/test/AnnotatedComponent.java?rev=1210959&r1=1210958&r2=1210959&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/manipulator/src/test/java/test/AnnotatedComponent.java (original)
+++ felix/trunk/ipojo/manipulator/manipulator/src/test/java/test/AnnotatedComponent.java Tue Dec 6 15:04:44 2011
@@ -1,15 +1,26 @@
+/*
+ * 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.
+ */
package test;
import org.apache.felix.ipojo.annotations.Component;
import org.apache.felix.ipojo.annotations.Property;
-/**
- * Created by IntelliJ IDEA.
- * User: guillaume
- * Date: 10/08/11
- * Time: 21:56
- * To change this template use File | Settings | File Templates.
- */
@Component
public class AnnotatedComponent {
Modified: felix/trunk/ipojo/manipulator/manipulator/src/test/java/test/Child.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator/src/test/java/test/Child.java?rev=1210959&r1=1210958&r2=1210959&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/manipulator/src/test/java/test/Child.java (original)
+++ felix/trunk/ipojo/manipulator/manipulator/src/test/java/test/Child.java Tue Dec 6 15:04:44 2011
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
package test;
public class Child extends Parent {
Modified: felix/trunk/ipojo/manipulator/manipulator/src/test/java/test/ClusterDaemon.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator/src/test/java/test/ClusterDaemon.java?rev=1210959&r1=1210958&r2=1210959&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/manipulator/src/test/java/test/ClusterDaemon.java (original)
+++ felix/trunk/ipojo/manipulator/manipulator/src/test/java/test/ClusterDaemon.java Tue Dec 6 15:04:44 2011
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
package test;
import java.util.ArrayList;
@@ -13,7 +31,6 @@ public class ClusterDaemon {
/**
* Controlled servers.
* @return cluster daemon controlled server names.
- * @throws ClusterDaemonException any.
*/
public ArrayList getControlledServersNames() {
return null;
Modified: felix/trunk/ipojo/manipulator/manipulator/src/test/java/test/ConstructorCheck.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator/src/test/java/test/ConstructorCheck.java?rev=1210959&r1=1210958&r2=1210959&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/manipulator/src/test/java/test/ConstructorCheck.java (original)
+++ felix/trunk/ipojo/manipulator/manipulator/src/test/java/test/ConstructorCheck.java Tue Dec 6 15:04:44 2011
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
package test;
Modified: felix/trunk/ipojo/manipulator/manipulator/src/test/java/test/NoValidConstructor.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator/src/test/java/test/NoValidConstructor.java?rev=1210959&r1=1210958&r2=1210959&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/manipulator/src/test/java/test/NoValidConstructor.java (original)
+++ felix/trunk/ipojo/manipulator/manipulator/src/test/java/test/NoValidConstructor.java Tue Dec 6 15:04:44 2011
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
package test;
public class NoValidConstructor {
Modified: felix/trunk/ipojo/manipulator/manipulator/src/test/java/test/Parent.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator/src/test/java/test/Parent.java?rev=1210959&r1=1210958&r2=1210959&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/manipulator/src/test/java/test/Parent.java (original)
+++ felix/trunk/ipojo/manipulator/manipulator/src/test/java/test/Parent.java Tue Dec 6 15:04:44 2011
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
package test;
public class Parent {
Modified: felix/trunk/ipojo/manipulator/manipulator/src/test/java/test/PojoWithInner.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator/src/test/java/test/PojoWithInner.java?rev=1210959&r1=1210958&r2=1210959&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/manipulator/src/test/java/test/PojoWithInner.java (original)
+++ felix/trunk/ipojo/manipulator/manipulator/src/test/java/test/PojoWithInner.java Tue Dec 6 15:04:44 2011
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
package test;
public class PojoWithInner {
Modified: felix/trunk/ipojo/manipulator/manipulator/src/test/java/test/SimplePojo.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator/src/test/java/test/SimplePojo.java?rev=1210959&r1=1210958&r2=1210959&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/manipulator/src/test/java/test/SimplePojo.java (original)
+++ felix/trunk/ipojo/manipulator/manipulator/src/test/java/test/SimplePojo.java Tue Dec 6 15:04:44 2011
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
package test;
public class SimplePojo {
Modified: felix/trunk/ipojo/manipulator/maven-ipojo-plugin/doc/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/maven-ipojo-plugin/doc/changelog.txt?rev=1210959&r1=1210958&r2=1210959&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/maven-ipojo-plugin/doc/changelog.txt (original)
+++ felix/trunk/ipojo/manipulator/maven-ipojo-plugin/doc/changelog.txt Tue Dec 6 15:04:44 2011
@@ -1,9 +1,24 @@
Changes from the 1.8.0 to 1.8.2
-------------------------------
+
** Bug
* [FELIX-2825] - The maven-ipojo-plugin does not replace component classes in WAR files
* [FELIX-2829] - The maven-ipojo-plugin archetype descriptor is not conform
* [FELIX-2833] - The maven-ipojo-plugin does not support manipulating artifact with a classifier
+ * [FELIX-3012] - "Duplicate name&signature" problem
+ * [FELIX-3098] - iPOJO new manipulator crashes when using a custom reporter
+ * [FELIX-3145] - VerifyError on Java 7
+ * [FELIX-3249] - iPOJO Bnd Plugin do not write all the metadatas in the manifest
+
+** Improvement
+ * [FELIX-3017] - The manipulator should return the original class if it's already manipulated
+ * [FELIX-3078] - Introduce resource abstraction in the iPOJO manipulator
+ * [FELIX-3079] - Adapt the Ant task and the maven plugin to use the new manipulator capabilities
+ * [FELIX-3080] - Implement a BND plugin for iPOJO
+ * [FELIX-3131] - Elements and attributes should conserve the insertion order
+ * [FELIX-3204] - @Temporal should handle instantiation-time properties
+ * [FELIX-3244] - Manipulator : DefaultManifestBuilder should be more extensible
+
Changes from the 1.6.0 to 1.8.0
-------------------------------
Modified: felix/trunk/ipojo/manipulator/maven-ipojo-plugin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/maven-ipojo-plugin/pom.xml?rev=1210959&r1=1210958&r2=1210959&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/maven-ipojo-plugin/pom.xml (original)
+++ felix/trunk/ipojo/manipulator/maven-ipojo-plugin/pom.xml Tue Dec 6 15:04:44 2011
@@ -128,4 +128,26 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: felix/trunk/ipojo/manipulator/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/pom.xml?rev=1210959&r1=1210958&r2=1210959&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/pom.xml (original)
+++ felix/trunk/ipojo/manipulator/pom.xml Tue Dec 6 15:04:44 2011
@@ -57,27 +57,68 @@
</includes>
</resource>
</resources>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-1</version>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptorRefs>
- <descriptorRef>project</descriptorRef>
- </descriptorRefs>
- <attach>false</attach>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
</build>
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>project</descriptorRef>
+ </descriptorRefs>
+ <!-- we don't want to attach all the assemblies, such as bz2 -->
+ <attach>false</attach>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <!-- only attach the project and bin assemblies, in tar.gz and zip flavors -->
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-assemblies</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>
+ ${project.build.directory}/${project.artifactId}-${project.version}-project.tar.gz
+ </file>
+ <classifier>project</classifier>
+ <type>tar.gz</type>
+ </artifact>
+ <artifact>
+ <file>
+ ${project.build.directory}/${project.artifactId}-${project.version}-project.zip
+ </file>
+ <classifier>project</classifier>
+ <type>zip</type>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>