felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clem...@apache.org
Subject svn commit: r1326404 - in /felix/trunk/ipojo: ./ annotations/ composite/ core/ runtime/ runtime/annotations/ runtime/composite/ runtime/core/
Date Sun, 15 Apr 2012 19:14:20 GMT
Author: clement
Date: Sun Apr 15 19:14:20 2012
New Revision: 1326404

URL: http://svn.apache.org/viewvc?rev=1326404&view=rev
Log:
Re-organization of the source code:
the runtime project now contains the core, composite and annotations.

Added:
    felix/trunk/ipojo/runtime/   (with props)
    felix/trunk/ipojo/runtime/DEPENDENCIES
    felix/trunk/ipojo/runtime/LICENSE
    felix/trunk/ipojo/runtime/NOTICE
    felix/trunk/ipojo/runtime/annotations/
      - copied from r1326400, felix/trunk/ipojo/annotations/
    felix/trunk/ipojo/runtime/composite/
      - copied from r1326400, felix/trunk/ipojo/composite/
    felix/trunk/ipojo/runtime/core/
      - copied from r1326400, felix/trunk/ipojo/core/
    felix/trunk/ipojo/runtime/org.apache.felix.ipojo.runtime-project.iml
    felix/trunk/ipojo/runtime/pom.xml
Removed:
    felix/trunk/ipojo/annotations/
    felix/trunk/ipojo/composite/
    felix/trunk/ipojo/core/
Modified:
    felix/trunk/ipojo/pom.xml
    felix/trunk/ipojo/runtime/annotations/pom.xml
    felix/trunk/ipojo/runtime/composite/pom.xml
    felix/trunk/ipojo/runtime/core/pom.xml

Modified: felix/trunk/ipojo/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/pom.xml?rev=1326404&r1=1326403&r2=1326404&view=diff
==============================================================================
--- felix/trunk/ipojo/pom.xml (original)
+++ felix/trunk/ipojo/pom.xml Sun Apr 15 19:14:20 2012
@@ -34,64 +34,34 @@
     <modules>
     <module>metadata</module>
     <module>manipulator</module>
-    <module>core</module>
-    <module>composite</module>
+    <module>runtime</module>
     <module>arch</module>
     <module>handler/extender</module>
     <module>handler/temporal</module>
     <module>handler/eventadmin</module>
     <module>handler/whiteboard</module>
+    <module>handler/jmx</module>
+    <module>handler/transaction</module>
     <module>api</module>
+	<module>arch-gogo</module>
+    <module>webconsole-plugin</module>
     <!-- remove junit4osgi during the release process
     <module>junit4osgi</module> -->
   </modules>
 
-
   <profiles>
-  <profile>
-    <id>junit4osgi</id>
-    <modules>
-      <module>junit4osgi</module>
-    </modules>
-  </profile>
-  <profile>
-    <id>java5</id>
-    <activation>
-      <jdk>1.5</jdk>
-    </activation>
-    <modules>
-      <module>annotations</module>
-      <module>arch-gogo</module>
-      <module>handler/jmx</module>
-      <module>webconsole-plugin</module>
-      <module>handler/transaction</module>
-    </modules>
-  </profile>
-  <profile>
-    <id>java6</id>
-    <activation>
-      <jdk>1.6</jdk>
-    </activation>
-    <modules>
-      <module>annotations</module>
-      <module>arch-gogo</module>
-      <module>handler/jmx</module>
-      <module>webconsole-plugin</module>
-      <module>handler/transaction</module>
-    </modules>
-  </profile>
-  <profile>
-    <id>examples</id>
-    <modules>
-      <module>examples</module>
-    </modules>
-  </profile>
-  <profile>
-    <id>tests</id>
-    <modules>
-      <module>tests</module>
-    </modules>
-  </profile>
+      <profile>
+        <id>examples</id>
+        <modules>
+          <module>examples</module>
+        </modules>
+      </profile>
+      <profile>
+        <id>tests</id>
+        <modules>
+          <module>tests</module>
+        </modules>
+      </profile>
   </profiles>
 
     <build>

Propchange: felix/trunk/ipojo/runtime/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Apr 15 19:14:20 2012
@@ -0,0 +1,7 @@
+target/*
+.git*
+.project
+.classpath
+.settings
+*.iml
+*.idea

Added: felix/trunk/ipojo/runtime/DEPENDENCIES
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/DEPENDENCIES?rev=1326404&view=auto
==============================================================================
--- felix/trunk/ipojo/runtime/DEPENDENCIES (added)
+++ felix/trunk/ipojo/runtime/DEPENDENCIES Sun Apr 15 19:14:20 2012
@@ -0,0 +1,15 @@
+Apache Felix iPOJO Runtime Project
+Copyright 2008-2012 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
+
+
+III. Overall License Summary
+- Apache License 2.0

Added: felix/trunk/ipojo/runtime/LICENSE
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/LICENSE?rev=1326404&view=auto
==============================================================================
--- felix/trunk/ipojo/runtime/LICENSE (added)
+++ felix/trunk/ipojo/runtime/LICENSE Sun Apr 15 19:14:20 2012
@@ -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/runtime/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/NOTICE?rev=1326404&view=auto
==============================================================================
--- felix/trunk/ipojo/runtime/NOTICE (added)
+++ felix/trunk/ipojo/runtime/NOTICE Sun Apr 15 19:14:20 2012
@@ -0,0 +1,10 @@
+Apache Felix iPOJO Runtime Project
+Copyright 2008-2012 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.
+
+This product includes software developed at
+Copyright (c) 2000-2005 INRIA, France Telecom
+Licensed under BSD License.

Modified: felix/trunk/ipojo/runtime/annotations/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/annotations/pom.xml?rev=1326404&r1=1326400&r2=1326404&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/annotations/pom.xml (original)
+++ felix/trunk/ipojo/runtime/annotations/pom.xml Sun Apr 15 19:14:20 2012
@@ -21,7 +21,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix-parent</artifactId>
     <version>1.2.1</version>
-    <relativePath>../../pom/pom.xml</relativePath>
+    <relativePath>../../../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>org.apache.felix.ipojo.annotations</artifactId>

Modified: felix/trunk/ipojo/runtime/composite/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/composite/pom.xml?rev=1326404&r1=1326400&r2=1326404&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/composite/pom.xml (original)
+++ felix/trunk/ipojo/runtime/composite/pom.xml Sun Apr 15 19:14:20 2012
@@ -21,7 +21,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix-parent</artifactId>
     <version>1.2.1</version>
-    <relativePath>../../pom/pom.xml</relativePath>
+    <relativePath>../../../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>bundle</packaging>

Modified: felix/trunk/ipojo/runtime/core/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core/pom.xml?rev=1326404&r1=1326400&r2=1326404&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core/pom.xml (original)
+++ felix/trunk/ipojo/runtime/core/pom.xml Sun Apr 15 19:14:20 2012
@@ -21,7 +21,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix-parent</artifactId>
     <version>1.2.1</version>
-    <relativePath>../../pom/pom.xml</relativePath>
+    <relativePath>../../../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>bundle</packaging>

Added: felix/trunk/ipojo/runtime/org.apache.felix.ipojo.runtime-project.iml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/org.apache.felix.ipojo.runtime-project.iml?rev=1326404&view=auto
==============================================================================
--- felix/trunk/ipojo/runtime/org.apache.felix.ipojo.runtime-project.iml (added)
+++ felix/trunk/ipojo/runtime/org.apache.felix.ipojo.runtime-project.iml Sun Apr 15 19:14:20
2012
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE"
version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.0" level="project"
/>
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymock:2.4" level="project"
/>
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-all:1.7"
level="project" />
+  </component>
+</module>
+

Added: felix/trunk/ipojo/runtime/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/pom.xml?rev=1326404&view=auto
==============================================================================
--- felix/trunk/ipojo/runtime/pom.xml (added)
+++ felix/trunk/ipojo/runtime/pom.xml Sun Apr 15 19:14:20 2012
@@ -0,0 +1,120 @@
+<!--
+  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.
+-->
+<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.runtime-project</artifactId>
+    <version>1.9.0-SNAPSHOT</version>
+    <name>Apache Felix iPOJO Runtime Project</name>
+    <packaging>pom</packaging>
+
+    <description>
+        The iPOJO runtime project contains the core iPOJO bundle, the composite support and
the annotations.
+    </description>
+
+    <modules>
+        <module>core</module>
+        <module>composite</module>
+        <module>annotations</module>
+    </modules>
+
+    <build>
+        <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-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>



Mime
View raw message