ipojo-toolbox-commits Mailing List for iPOJO Toolbox
Brought to you by:
bourretp
You can subscribe to this list here.
| 2009 |
Jan
|
Feb
(12) |
Mar
(28) |
Apr
(23) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|---|
|
From: <bou...@us...> - 2009-04-21 10:50:05
|
Revision: 67
http://ipojo-toolbox.svn.sourceforge.net/ipojo-toolbox/?rev=67&view=rev
Author: bourretp
Date: 2009-04-21 10:49:54 +0000 (Tue, 21 Apr 2009)
Log Message:
-----------
iPOJO Arch Equinox command :
* Package renamed to net.sourceforge.ipojo_toolbox
* Modified component name and instance name.
iPOJO JUnit4OSGi Equinox command :
* Simplified pom.xml
* Removed + scn:ignore ecplise files.
Modified Paths:
--------------
trunk/pom/pom.xml
trunk/utils/arch-equinox/NOTICE
trunk/utils/arch-equinox/pom.xml
trunk/utils/ipojo-metatype-bridge/src/main/java/net/sourceforge/ipojo_toolbox/utils/metatype_bridge/MetatypeBridgeManager.java
trunk/utils/junit4osgi-equinox/pom.xml
Added Paths:
-----------
trunk/utils/arch-equinox/metadata.xml
trunk/utils/arch-equinox/src/main/java/net/
trunk/utils/arch-equinox/src/main/java/net/sourceforge/
trunk/utils/arch-equinox/src/main/java/net/sourceforge/ipojo_toolbox/
trunk/utils/arch-equinox/src/main/java/net/sourceforge/ipojo_toolbox/utils/
trunk/utils/arch-equinox/src/main/java/net/sourceforge/ipojo_toolbox/utils/arch_equinox/
trunk/utils/arch-equinox/src/main/java/net/sourceforge/ipojo_toolbox/utils/arch_equinox/ArchEquinox.java
Removed Paths:
-------------
trunk/utils/arch-equinox/src/main/java/org/
trunk/utils/arch-equinox/src/main/resources/metadata.xml
trunk/utils/junit4osgi-equinox/.checkstyle
trunk/utils/junit4osgi-equinox/.classpath
trunk/utils/junit4osgi-equinox/.externalToolBuilders/
trunk/utils/junit4osgi-equinox/.project
trunk/utils/junit4osgi-equinox/.settings/
Property Changed:
----------------
trunk/utils/junit4osgi-equinox/
Modified: trunk/pom/pom.xml
===================================================================
--- trunk/pom/pom.xml 2009-04-20 15:23:43 UTC (rev 66)
+++ trunk/pom/pom.xml 2009-04-21 10:49:54 UTC (rev 67)
@@ -133,6 +133,8 @@
<!-- List of sub-projects -->
<modules>
<module>../utils/ipojo-metatype-bridge</module>
+ <module>../utils/arch-equinox</module>
+ <module>../utils/junit4osgi-equinox</module>
<module>../runtime/felix</module>
</modules>
</profile>
Modified: trunk/utils/arch-equinox/NOTICE
===================================================================
--- trunk/utils/arch-equinox/NOTICE 2009-04-20 15:23:43 UTC (rev 66)
+++ trunk/utils/arch-equinox/NOTICE 2009-04-21 10:49:54 UTC (rev 67)
@@ -1,4 +1,4 @@
-Apache Felix iPOJO Arch Command for Equinox
+iPOJO Toolbox : Arch command for Equinox
Copyright 2008 The Apache Software Foundation
I. Included Software
Copied: trunk/utils/arch-equinox/metadata.xml (from rev 66, trunk/utils/arch-equinox/src/main/resources/metadata.xml)
===================================================================
--- trunk/utils/arch-equinox/metadata.xml (rev 0)
+++ trunk/utils/arch-equinox/metadata.xml 2009-04-21 10:49:54 UTC (rev 67)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<iPOJO>
+ <component className="net.sourceforge.ipojo_toolbox.utils.arch_equinox.ArchEquinox"
+ name="net.sourceforge.ipojo_toolbox.ArchEquinox"
+ factory="false">
+ <provides />
+ <requires field="m_archs" optional="true" />
+ <requires field="m_factories" optional="true"/>
+ <requires field="m_handlers" optional="true"/>
+ </component>
+ <instance component="net.sourceforge.ipojo_toolbox.ArchEquinox"
+ name="net.sourceforge.ipojo_toolbox.ArchEquinox" />
+</iPOJO>
\ No newline at end of file
Modified: trunk/utils/arch-equinox/pom.xml
===================================================================
--- trunk/utils/arch-equinox/pom.xml 2009-04-20 15:23:43 UTC (rev 66)
+++ trunk/utils/arch-equinox/pom.xml 2009-04-21 10:49:54 UTC (rev 67)
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
+<!--
+ 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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -30,14 +30,14 @@
<!-- Project coordinates -->
<groupId>net.sourceforge.ipojo-toolbox</groupId>
- <artifactId>equinox-arch-command</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <artifactId>arch-equinox</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<!-- Project's informations -->
- <name>iPOJO Toolbox : iPOJO Arch command for Equinox</name>
+ <name>iPOJO Toolbox : Arch command for Equinox</name>
<description>The Equinox version of the Apache Felix iPOJO Arch command.</description>
- <url>http://ipojo-toolbox.wiki.sourceforge.net/Equinox</url>
+ <url>http://ipojo-toolbox.wiki.sourceforge.net/TODO !!!</url>
<inceptionYear>2009</inceptionYear>
<!-- Give access to Eclipse artifacts -->
@@ -63,7 +63,7 @@
<version>1.2.0</version>
</dependency>
- <!-- Equinox -->
+ <!-- Equinox OSGi -->
<dependency>
<groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi</artifactId>
@@ -77,15 +77,12 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <!-- TODO : add plugin management section to avoid to specify plugin version here. -->
<version>2.0.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-Name>iPOJO Arch Equinox Command</Bundle-Name>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
- <Private-Package>org.apache.felix.ipojo.arch.equinox</Private-Package>
+ <Private-Package>net.sourceforge.ipojo_toolbox.utils.arch_equinox</Private-Package>
<Include-Resource>META-INF/LICENCE=LICENSE, META-INF/NOTICE=NOTICE</Include-Resource>
</instructions>
</configuration>
Copied: trunk/utils/arch-equinox/src/main/java/net/sourceforge/ipojo_toolbox/utils/arch_equinox/ArchEquinox.java (from rev 66, trunk/utils/arch-equinox/src/main/java/org/apache/felix/ipojo/arch/equinox/ArchEquinox.java)
===================================================================
--- trunk/utils/arch-equinox/src/main/java/net/sourceforge/ipojo_toolbox/utils/arch_equinox/ArchEquinox.java (rev 0)
+++ trunk/utils/arch-equinox/src/main/java/net/sourceforge/ipojo_toolbox/utils/arch_equinox/ArchEquinox.java 2009-04-21 10:49:54 UTC (rev 67)
@@ -0,0 +1,231 @@
+/*
+ * 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 net.sourceforge.ipojo_toolbox.utils.arch_equinox;
+
+import java.lang.reflect.Field;
+import java.util.List;
+
+import org.apache.felix.ipojo.ComponentInstance;
+import org.apache.felix.ipojo.Factory;
+import org.apache.felix.ipojo.HandlerFactory;
+import org.apache.felix.ipojo.IPojoFactory;
+import org.apache.felix.ipojo.architecture.Architecture;
+import org.apache.felix.ipojo.architecture.InstanceDescription;
+import org.eclipse.osgi.framework.console.CommandInterpreter;
+import org.eclipse.osgi.framework.console.CommandProvider;
+
+/**
+ * Implementation of the arch command printing the actual architecture
+ * for Eclipse Equinox.
+ * @author <a href="mailto:de...@fe...">Felix Project Team</a>
+ */
+public class ArchEquinox implements CommandProvider {
+
+ /**
+ * List of arch services.
+ */
+ private Architecture[] m_archs;
+
+ /**
+ * Factory services.
+ */
+ private Factory[] m_factories;
+
+ /**
+ * Handler Factories.
+ */
+ private HandlerFactory[] m_handlers;
+
+ /**
+ * Get the command name.
+ * @return the command name (arch)
+ * @see org.apache.felix.shell.Command#getName()
+ */
+ public String getName() {
+ return "arch";
+ }
+
+ /**
+ * Gets help message.
+ * @return the command usage.
+ * @see org.eclipse.osgi.framework.console.CommandProvider#getHelp()
+ */
+ public String getHelp() {
+ return "arch [-factories] [-instances] [-handlers] [-factory factory_name] [-instance instance_name]";
+ }
+
+ /**
+ * Gets a small description.
+ * @return get a description.
+ * @see org.apache.felix.shell.Command#getShortDescription()
+ */
+ public String getShortDescription() {
+ return "Architecture command : display the architecture";
+ }
+
+ /**
+ * Provides the arch command.
+ * @param intp : interpreter.
+ * @see org.apache.felix.shell.Command#execute(java.lang.String, java.io.PrintStream, java.io.PrintStream)
+ */
+ public void _arch(CommandInterpreter intp ) {
+
+ String argOne = intp.nextArgument();
+ String name = intp.nextArgument();
+
+ if (argOne == null || argOne.equalsIgnoreCase("-instances") || argOne.length() == 0) {
+ printInstances(intp);
+ return;
+ }
+
+ if (argOne.equalsIgnoreCase("-factories")) {
+ printFactories(intp);
+ return;
+ }
+
+ if (argOne.equalsIgnoreCase("-factory") && name != null) {
+ printFactory(name, intp);
+ return;
+ }
+
+ if (argOne.equalsIgnoreCase("-instance") && name != null) {
+ printInstance(name, intp);
+ return;
+ }
+
+ if (argOne.equalsIgnoreCase("-handlers")) {
+ printHandlers(intp);
+ return;
+ }
+
+
+ if (argOne.equalsIgnoreCase("-stats")) {
+ printStats(intp);
+ return;
+ }
+
+ intp.println(getHelp());
+ }
+
+ /**
+ * Prints the statistics.
+ * @param out : interpreter
+ */
+ private void printStats(CommandInterpreter out) {
+ try {
+ Field field = IPojoFactory.class.getDeclaredField("m_instancesName");
+ field.setAccessible(true); // The field is not accessible.
+ List names = (List) field.get(null);
+ out.println("Number of living instances : " + names.size());
+ out.println("Created instances : " + names);
+ } catch (SecurityException e) {
+ out.println("Cannot compute stats : " + e.getMessage());
+ } catch (IllegalArgumentException e) {
+ out.println("Cannot compute stats : " + e.getMessage());
+ } catch (IllegalAccessException e) {
+ out.println("Cannot compute stats : " + e.getMessage());
+ } catch (NoSuchFieldException e) {
+ out.println("Cannot compute stats : " + e.getMessage());
+ }
+
+ }
+
+ /**
+ * Prints instance list.
+ * @param out : interpreter
+ */
+ private void printInstances(CommandInterpreter out) {
+ for (int i = 0; i < m_archs.length; i++) {
+ InstanceDescription instance = m_archs[i].getInstanceDescription();
+ if (instance.getState() == ComponentInstance.VALID) {
+ out.println("Instance " + instance.getName() + " -> valid");
+ }
+ if (instance.getState() == ComponentInstance.INVALID) {
+ out.println("Instance " + instance.getName() + " -> invalid");
+ }
+ if (instance.getState() == ComponentInstance.STOPPED) {
+ out.println("Instance " + instance.getName() + " -> stopped");
+ }
+ }
+ }
+
+ /**
+ * Prints instance description.
+ * @param name : instance name
+ * @param out : interpreter
+ */
+ private void printInstance(String name, CommandInterpreter out) {
+ for (int i = 0; i < m_archs.length; i++) {
+ InstanceDescription instance = m_archs[i].getInstanceDescription();
+ if (instance.getName().equalsIgnoreCase(name)) {
+ out.println(instance.getDescription());
+ return;
+ }
+ }
+ out.println("Instance " + name + " not found");
+ }
+
+ /**
+ * Prints factories.
+ * @param out : interpreter
+ */
+ private void printFactories(CommandInterpreter out) {
+ for (int i = 0; i < m_factories.length; i++) {
+ if (m_factories[i].getMissingHandlers().size() == 0) {
+ out.println("Factory " + m_factories[i].getName() + " (VALID)");
+ } else {
+ out.println("Factory " + m_factories[i].getName() + " (INVALID : " + m_factories[i].getMissingHandlers() + ")");
+ }
+ }
+ }
+
+ /**
+ * Prints factory description.
+ * @param name : factory name
+ * @param out : interpreter
+ */
+ private void printFactory(String name, CommandInterpreter out) {
+ for (int i = 0; i < m_factories.length; i++) {
+ if (m_factories[i].getName().equalsIgnoreCase(name)) {
+ out.println(m_factories[i].getDescription());
+ return;
+ }
+ }
+ out.println("Factory " + name + " not found");
+ }
+
+ /**
+ * Prints the list of available handlers (and validity).
+ * @param out : interpreter
+ */
+ private void printHandlers(CommandInterpreter out) {
+ for (int i = 0; i < m_handlers.length; i++) {
+ String name = m_handlers[i].getHandlerName();
+ if ("composite".equals(m_handlers[i].getType())) {
+ name = name + " [composite]";
+ }
+ if (m_handlers[i].getMissingHandlers().size() == 0) {
+ out.println("Handler " + name + " (VALID)");
+ } else {
+ out.println("Handler " + name + " (INVALID : " + m_handlers[i].getMissingHandlers() + ")");
+ }
+ }
+ }
+
+}
Deleted: trunk/utils/arch-equinox/src/main/resources/metadata.xml
===================================================================
--- trunk/utils/arch-equinox/src/main/resources/metadata.xml 2009-04-20 15:23:43 UTC (rev 66)
+++ trunk/utils/arch-equinox/src/main/resources/metadata.xml 2009-04-21 10:49:54 UTC (rev 67)
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<iPOJO>
- <Component className="org.apache.felix.ipojo.arch.equinox.ArchEquinox"
- factory="false">
- <Provides />
- <Requires field="m_archs" optional="true" />
- <Requires field="m_factories" optional="true"/>
- <Requires field="m_handlers" optional="true"/>
- </Component>
- <instance component="org.apache.felix.ipojo.arch.equinox.ArchEquinox"
- name="ArchCommand" />
-</iPOJO>
\ No newline at end of file
Modified: trunk/utils/ipojo-metatype-bridge/src/main/java/net/sourceforge/ipojo_toolbox/utils/metatype_bridge/MetatypeBridgeManager.java
===================================================================
--- trunk/utils/ipojo-metatype-bridge/src/main/java/net/sourceforge/ipojo_toolbox/utils/metatype_bridge/MetatypeBridgeManager.java 2009-04-20 15:23:43 UTC (rev 66)
+++ trunk/utils/ipojo-metatype-bridge/src/main/java/net/sourceforge/ipojo_toolbox/utils/metatype_bridge/MetatypeBridgeManager.java 2009-04-21 10:49:54 UTC (rev 67)
@@ -20,7 +20,7 @@
/**
* Store created wrapper per iPOJO Factories.
*/
- private Map/*Factory, ComponentInstance<MetatypeBundleBridge>*/ m_bridges = new HashMap();
+ private Map/*<Factory, ComponentInstance<MetatypeBundleBridge>>*/ m_bridges = new HashMap();
/**
* Wrapper Factory
Property changes on: trunk/utils/junit4osgi-equinox
___________________________________________________________________
Added: svn:ignore
+ .project
.classpath
.settings
target
Deleted: trunk/utils/junit4osgi-equinox/.checkstyle
===================================================================
--- trunk/utils/junit4osgi-equinox/.checkstyle 2009-04-20 15:23:43 UTC (rev 66)
+++ trunk/utils/junit4osgi-equinox/.checkstyle 2009-04-21 10:49:54 UTC (rev 67)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fileset-config file-format-version="1.2.0" simple-config="true">
- <fileset name="tous" enabled="true" check-config-name="Sun Checks" local="false">
- <file-match-pattern match-pattern="." include-pattern="true"/>
- </fileset>
- <filter name="NonSrcDirs" enabled="true"/>
-</fileset-config>
Deleted: trunk/utils/junit4osgi-equinox/.classpath
===================================================================
--- trunk/utils/junit4osgi-equinox/.classpath 2009-04-20 15:23:43 UTC (rev 66)
+++ trunk/utils/junit4osgi-equinox/.classpath 2009-04-21 10:49:54 UTC (rev 67)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry excluding="**/*.java" including="LICENSE*|NOTICE*" kind="src" path=""/>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/easymock/easymock/1.2_Java1.3/easymock-1.2_Java1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/felix/javax.servlet/1.0.0/javax.servlet-1.0.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.apache.felix.ipojo/1.2.0/org.apache.felix.ipojo-1.2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.apache.felix.ipojo.metadata/1.2.0/org.apache.felix.ipojo.metadata-1.2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/osgi/org.eclipse.osgi/3.2.1/org.eclipse.osgi-3.2.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.osgi.compendium/1.2.0/org.osgi.compendium-1.2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.osgi.core/1.0.1/org.osgi.core-1.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.osgi.foundation/1.2.0/org.osgi.foundation-1.2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.apache.felix.ipojo.junit4osgi/1.1.0-SNAPSHOT/org.apache.felix.ipojo.junit4osgi-1.1.0-SNAPSHOT.jar"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
Deleted: trunk/utils/junit4osgi-equinox/.project
===================================================================
--- trunk/utils/junit4osgi-equinox/.project 2009-04-20 15:23:43 UTC (rev 66)
+++ trunk/utils/junit4osgi-equinox/.project 2009-04-21 10:49:54 UTC (rev 67)
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.apache.felix.ipojo.junit4osgi.equinox.command</name>
- <comment>Apache felix is an OSGi implementation.</comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
- <triggers>full,incremental,</triggers>
- <arguments>
- <dictionary>
- <key>LaunchConfigHandle</key>
- <value><project>/.externalToolBuilders/com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder.launch</value>
- </dictionary>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
- <arguments>
- <dictionary>
- <key>LaunchConfigHandle</key>
- <value><project>/.externalToolBuilders/Maven_Ant_Builder.launch</value>
- </dictionary>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
Modified: trunk/utils/junit4osgi-equinox/pom.xml
===================================================================
--- trunk/utils/junit4osgi-equinox/pom.xml 2009-04-20 15:23:43 UTC (rev 66)
+++ trunk/utils/junit4osgi-equinox/pom.xml 2009-04-21 10:49:54 UTC (rev 67)
@@ -1,52 +1,79 @@
-<!--
- 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.
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <!-- Project parent -->
<parent>
- <groupId>org.apache.felix</groupId>
- <artifactId>felix</artifactId>
- <version>1.0.2</version>
+ <groupId>net.sourceforge.ipojo-toolbox</groupId>
+ <artifactId>ipojo-toolbox</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../pom/pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>bundle</packaging>
- <name>Junit4Osgi-Equinox-Command</name>
- <artifactId>
- org.apache.felix.ipojo.junit4osgi.equinox-command
- </artifactId>
+
+ <!-- Project coordinates -->
+ <groupId>net.sourceforge.ipojo-toolbox</groupId>
+ <artifactId>junit4osgi-equinox</artifactId>
<version>1.1.0-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+
+ <!-- Project's informations -->
+ <name>iPOJO Toolbox : Junit4OSGi command for Equinox</name>
+ <description>The Equinox version of the Apache Felix iPOJO Junit4OSGi command.</description>
+ <url>http://ipojo-toolbox.wiki.sourceforge.net/TODO !!!</url>
+ <inceptionYear>2009</inceptionYear>
+
+ <!-- Give access to Eclipse artifacts -->
+ <repositories>
+ <repository>
+ <id>eclipse</id>
+ <url>http://repo1.maven.org/eclipse</url>
+ </repository>
+ </repositories>
+
+ <!-- Project dependencies -->
<dependencies>
+
+ <!-- The Junit4OSGi bundle -->
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.junit4osgi</artifactId>
<version>1.1.0-SNAPSHOT</version>
</dependency>
+
+ <!-- The Junit test framework -->
<dependency>
- <groupId>org.eclipse.osgi</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
- <version>3.2.1</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
</dependency>
+
+ <!-- Equinox OSGi -->
+ <dependency>
+ <groupId>org.eclipse.osgi</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
+ <version>3.2.1</version>
+ </dependency>
</dependencies>
+
+ <!-- Build configuration -->
<build>
<plugins>
<plugin>
@@ -60,24 +87,20 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
+ <version>2.0.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-Name> Apache Felix iPOJO OSGi Junit Runner - Equinox Command
- </Bundle-Name>
- <Bundle-SymbolicName> ${pom.artifactId}</Bundle-SymbolicName>
- <Private-Package> org.apache.felix.ipojo.junit4osgi.equinox
- </Private-Package>
- <Include-Resource> META-INF/LICENCE=LICENSE,
- META-INF/NOTICE=NOTICE </Include-Resource>
+ <Bundle-Name>iPOJO JUnit4OSGi Equinox Command</Bundle-Name>
+ <Private-Package>org.apache.felix.ipojo.junit4osgi.equinox</Private-Package>
+ <Include-Resource>META-INF/LICENCE=LICENSE, META-INF/NOTICE=NOTICE</Include-Resource>
</instructions>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.2.0</version>
<executions>
<execution>
<goals>
@@ -89,39 +112,6 @@
</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>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin
- </artifactId>
- <configuration>
- <configLocation>
- http://felix.apache.org/ipojo/dev/checkstyle_ipojo.xml
- </configLocation>
- </configuration>
- </plugin>
</plugins>
</build>
- <repositories>
- <!-- Give access to Eclipse artifacts -->
- <repository>
- <id>eclipse</id>
- <url>http://repo1.maven.org/eclipse</url>
- </repository>
- </repositories>
-
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bou...@us...> - 2009-04-20 15:23:58
|
Revision: 66
http://ipojo-toolbox.svn.sourceforge.net/ipojo-toolbox/?rev=66&view=rev
Author: bourretp
Date: 2009-04-20 15:23:43 +0000 (Mon, 20 Apr 2009)
Log Message:
-----------
iPOJO Metatype bridge :
- Removed org.apache.felix.ipojo ghost package
* Renamed component types, implementation classes and instance names.
Modified Paths:
--------------
trunk/utils/ipojo-metatype-bridge/metadata.xml
Added Paths:
-----------
trunk/utils/ipojo-metatype-bridge/src/main/java/net/sourceforge/ipojo_toolbox/utils/metatype_bridge/Factory2MetatypeBridge.java
trunk/utils/ipojo-metatype-bridge/src/main/java/net/sourceforge/ipojo_toolbox/utils/metatype_bridge/MetatypeBridgeManager.java
Removed Paths:
-------------
trunk/utils/ipojo-metatype-bridge/src/main/java/net/sourceforge/ipojo_toolbox/utils/metatype_bridge/MetatypeBridge.java
trunk/utils/ipojo-metatype-bridge/src/main/java/net/sourceforge/ipojo_toolbox/utils/metatype_bridge/MetatypeFactoryWrapper.java
trunk/utils/ipojo-metatype-bridge/src/main/java/org/
Modified: trunk/utils/ipojo-metatype-bridge/metadata.xml
===================================================================
--- trunk/utils/ipojo-metatype-bridge/metadata.xml 2009-04-20 09:15:10 UTC (rev 65)
+++ trunk/utils/ipojo-metatype-bridge/metadata.xml 2009-04-20 15:23:43 UTC (rev 66)
@@ -19,17 +19,17 @@
-->
<!-- TODO !!! : Rename components type, instances and properties -->
<iPOJO>
- <component className="net.sourceforge.ipojo_toolbox.utils.metatype_bridge.MetatypeBridge" architecture="true" public="false">
+ <component name="net.sourceforge.ipojo_toolbox.MetatypeBridgeManager" className="net.sourceforge.ipojo_toolbox.utils.metatype_bridge.MetatypeBridgeManager" architecture="true" public="false">
<requires filter="(factory.state=1)" optional="true" aggregate="true">
<callback type="bind" method="bindFactory"/>
<callback type="unbind" method="unbindFactory"/>
</requires>
- <requires field="m_wrapperFactory" filter="(factory.name=MetatypeBundleBridge)"/>
+ <requires field="m_wrapperFactory" filter="(factory.name=net.sourceforge.ipojo_toolbox.Factory2MetatypeBridge)"/>
<callback transition="invalidate" method="stop"/>
</component>
- <instance component="net.sourceforge.ipojo_toolbox.utils.metatype_bridge.MetatypeBridge"/>
+ <instance component="net.sourceforge.ipojo_toolbox.MetatypeBridgeManager" name="net.sourceforge.ipojo_toolbox.MetatypeBridgeManager"/>
- <component className="net.sourceforge.ipojo_toolbox.utils.metatype_bridge.MetatypeFactoryWrapper" architecture="false" name="MetatypeBundleBridge">
+ <component name="net.sourceforge.ipojo_toolbox.Factory2MetatypeBridge" className="net.sourceforge.ipojo_toolbox.utils.metatype_bridge.Factory2MetatypeBridge">
<provides>
<property name="bundle.id" type="long"/>
<property name="service.pid" type="java.lang.String"/>
Copied: trunk/utils/ipojo-metatype-bridge/src/main/java/net/sourceforge/ipojo_toolbox/utils/metatype_bridge/Factory2MetatypeBridge.java (from rev 65, trunk/utils/ipojo-metatype-bridge/src/main/java/net/sourceforge/ipojo_toolbox/utils/metatype_bridge/MetatypeFactoryWrapper.java)
===================================================================
--- trunk/utils/ipojo-metatype-bridge/src/main/java/net/sourceforge/ipojo_toolbox/utils/metatype_bridge/Factory2MetatypeBridge.java (rev 0)
+++ trunk/utils/ipojo-metatype-bridge/src/main/java/net/sourceforge/ipojo_toolbox/utils/metatype_bridge/Factory2MetatypeBridge.java 2009-04-20 15:23:43 UTC (rev 66)
@@ -0,0 +1,229 @@
+package net.sourceforge.ipojo_toolbox.utils.metatype_bridge;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Dictionary;
+import java.util.List;
+
+import org.apache.felix.ipojo.IPojoFactory;
+import org.apache.felix.ipojo.architecture.ComponentTypeDescription;
+import org.apache.felix.ipojo.architecture.PropertyDescription;
+import org.osgi.service.cm.ConfigurationException;
+import org.osgi.service.cm.ManagedServiceFactory;
+import org.osgi.service.metatype.AttributeDefinition;
+import org.osgi.service.metatype.MetaTypeProvider;
+import org.osgi.service.metatype.ObjectClassDefinition;
+
+/**
+ * ManagedServiceFactory wrapper.
+ * This class delegates call to the wrapped managed service factory.
+ * However, it provides a Metatype description for the factory configurations.
+ */
+public class Factory2MetatypeBridge implements MetaTypeProvider, ManagedServiceFactory {
+
+ /**
+ * Wrapped Factory.
+ */
+ private IPojoFactory m_factory; //Injected
+
+ private class ObjectClassDefinitionImpl implements ObjectClassDefinition {
+
+ private ComponentTypeDescription m_description;
+
+ List m_attributes = new ArrayList();
+
+ public ObjectClassDefinitionImpl(ComponentTypeDescription desc) {
+ m_description = desc;
+ PropertyDescription[] props = desc.getProperties();
+ for (int i = 0; i < props.length; i++) {
+ m_attributes.add(new AttributeDefinitionImpl(props[i], m_description.getName()));
+ }
+ }
+
+ public AttributeDefinition[] getAttributeDefinitions(int filter) {
+ List list = new ArrayList();
+ switch(filter) {
+ case ObjectClassDefinition.OPTIONAL :
+ for (int i = 0; i < m_attributes.size(); i++) {
+ AttributeDefinitionImpl att = (AttributeDefinitionImpl) m_attributes.get(i);
+ if (! att.m_isImmutable && ! att.m_isMandatory) {
+ list.add(att);
+ }
+ }
+ break;
+ case ObjectClassDefinition.REQUIRED:
+ for (int i = 0; i < m_attributes.size(); i++) {
+ AttributeDefinitionImpl att = (AttributeDefinitionImpl) m_attributes.get(i);
+ if (! att.m_isImmutable && att.m_isMandatory) {
+ list.add(att);
+ }
+ }
+ break;
+ default :
+ for (int i = 0; i < m_attributes.size(); i++) {
+ AttributeDefinitionImpl att = (AttributeDefinitionImpl) m_attributes.get(i);
+ if (! att.m_isImmutable) {
+ list.add(att);
+ }
+ }
+ }
+ return (AttributeDefinition[]) list.toArray(new AttributeDefinition[list.size()]);
+ }
+
+ public String getDescription() {
+ return m_description.getName();
+ }
+
+ public String getID() {
+ return m_description.getName();
+ }
+
+ public InputStream getIcon(int arg0) throws IOException {
+ return null;
+ }
+
+ public String getName() {
+ return m_description.getName();
+ }
+
+ }
+
+ private class AttributeDefinitionImpl implements AttributeDefinition {
+
+ private PropertyDescription m_desc;
+ private String m_typeName;
+
+ private int m_type;
+ private int m_cardinality;
+ private boolean m_isMandatory;
+ private boolean m_isImmutable;
+
+ public AttributeDefinitionImpl(PropertyDescription desc, String typeName) {
+ m_desc = desc;
+ m_typeName = typeName;
+ m_isMandatory = desc.isMandatory();
+ m_isImmutable = desc.isImmutable();
+ String type = m_desc.getType();
+ String internType = null;
+ if (type.endsWith("[]")) {
+ // Array
+ m_cardinality = Integer.MAX_VALUE;
+ int index = type.indexOf('[');
+ internType = type.substring(0, index);
+ } else if (type.equals(java.util.Vector.class.getName())) {
+ m_cardinality = Integer.MIN_VALUE;
+ internType = String.class.getName();
+ } else {
+ m_cardinality = 0;
+ internType = type;
+ }
+ m_type = getTypeByInternType(internType);
+ }
+
+ private int getTypeByInternType(String internType) {
+ //STRING,LONG,INTEGER, CHAR,BYTE,DOUBLE,FLOAT, BOOLEAN
+
+ if (internType.equalsIgnoreCase("string") || internType.equals(String.class.getName())) {
+ return AttributeDefinition.STRING;
+ }
+ if (internType.equals("boolean")) {
+ return AttributeDefinition.BOOLEAN;
+ }
+ if (internType.equals("float")) {
+ return AttributeDefinition.FLOAT;
+ }
+ if (internType.equals("double")) {
+ return AttributeDefinition.DOUBLE;
+ }
+ if (internType.equals("byte")) {
+ return AttributeDefinition.BYTE;
+ }
+ if (internType.equals("char")) {
+ return AttributeDefinition.CHARACTER;
+ }
+ if (internType.equals("int")) {
+ return AttributeDefinition.INTEGER;
+ }
+ if (internType.equals("long")) {
+ return AttributeDefinition.LONG;
+ }
+ System.out.println("WARNING : Cannot determine the type of " + internType);
+ return -1;
+ }
+
+ public int getCardinality() {
+ return m_cardinality;
+ }
+
+ public String[] getDefaultValue() {
+ if (m_desc.getValue() != null) {
+ if (getCardinality() == 0) {
+ return new String[] { m_desc.getValue() };
+ } else if (m_cardinality > 0) {
+ return org.apache.felix.ipojo.parser.ParseUtils.parseArrays(m_desc.getValue());
+ } else if (m_cardinality < 0) {
+ //TODO handle vector case
+ return new String[] { m_desc.getValue() };
+ }
+ }
+ return null;
+ }
+
+ public String getDescription() {
+ return m_desc.getName();
+ }
+
+ public String getID() {
+ return m_typeName + "-" + m_desc.getName();
+
+ }
+
+ public String getName() {
+ return m_desc.getName();
+ }
+
+ public String[] getOptionLabels() {
+ return null;
+ }
+
+ public String[] getOptionValues() {
+ return null;
+ }
+
+ public int getType() {
+ return m_type;
+ }
+
+ public String validate(String arg0) {
+ return null; // No validation
+ }
+
+
+
+ }
+
+ public void deleted(String arg0) {
+ m_factory.deleted(arg0);
+ }
+
+ public String getName() {
+ return m_factory.getName();
+ }
+
+ public void updated(String arg0, Dictionary arg1)
+ throws ConfigurationException {
+ m_factory.updated(arg0, arg1);
+
+ }
+
+ public String[] getLocales() {
+ return null;
+ }
+
+ public ObjectClassDefinition getObjectClassDefinition(String id,
+ String loc) {
+ return new ObjectClassDefinitionImpl(m_factory.getComponentDescription());
+ }
+
+}
Property changes on: trunk/utils/ipojo-metatype-bridge/src/main/java/net/sourceforge/ipojo_toolbox/utils/metatype_bridge/Factory2MetatypeBridge.java
___________________________________________________________________
Added: svn:mergeinfo
+
Deleted: trunk/utils/ipojo-metatype-bridge/src/main/java/net/sourceforge/ipojo_toolbox/utils/metatype_bridge/MetatypeBridge.java
===================================================================
--- trunk/utils/ipojo-metatype-bridge/src/main/java/net/sourceforge/ipojo_toolbox/utils/metatype_bridge/MetatypeBridge.java 2009-04-20 09:15:10 UTC (rev 65)
+++ trunk/utils/ipojo-metatype-bridge/src/main/java/net/sourceforge/ipojo_toolbox/utils/metatype_bridge/MetatypeBridge.java 2009-04-20 15:23:43 UTC (rev 66)
@@ -1,74 +0,0 @@
-package net.sourceforge.ipojo_toolbox.utils.metatype_bridge;
-
-import java.util.Collection;
-import java.util.Dictionary;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-
-import org.apache.felix.ipojo.Factory;
-import org.apache.felix.ipojo.InstanceManager;
-import org.osgi.framework.Bundle;
-
-/**
- * Creates on the fly ManagedServiceFactory implementing MetatypeProvider.
- * The created MSF just delegates calls on the wrapped one.
- */
-public class MetatypeBridge {
-
- /**
- * Store created wrapper per iPOJO Factories.
- */
- private Map/*Factory, ComponentInstance<MetatypeBundleBridge>*/ m_bridges = new HashMap();
-
- /**
- * Wrapper Factory
- */
- private Factory m_wrapperFactory; // injected (only valid factories)
-
- public synchronized void bindFactory(Factory factory) {
- Bundle bundle = factory.getComponentDescription().getBundleContext().getBundle();
- InstanceManager instance = (InstanceManager) m_bridges.get(factory);
- if (instance == null) {
- // Create a new instance for this factory
- Dictionary prop = new Properties();
- prop.put("bundle.id", new Long(bundle.getBundleId()));
- prop.put("factory", factory);
- prop.put("factory.name", factory.getName());
- prop.put("service.pid", factory.getName()+ "-WRAPPER");
-
- try {
- instance = (InstanceManager) m_wrapperFactory.createComponentInstance(prop);
- m_bridges.put(factory, instance);
- } catch (Exception e) {
- System.out.println("ERROR : Cannot create a bridge instance : "
- + e.getMessage());
- e.printStackTrace();
- return;
- }
- }
- }
-
- public synchronized void unbindFactory(Factory factory) {
- InstanceManager instance = (InstanceManager) m_bridges.remove(factory);
- if (instance == null) {
- // Ignore ...
- return;
- } else {
- instance.dispose();
- }
-
- }
-
- public void stop() {
- // Cleanup
- Collection instances = m_bridges.values();
- Iterator it = instances.iterator();
- while (it.hasNext()) {
- ((InstanceManager) it.next()).dispose();
- }
- m_bridges.clear();
- }
-
-}
Copied: trunk/utils/ipojo-metatype-bridge/src/main/java/net/sourceforge/ipojo_toolbox/utils/metatype_bridge/MetatypeBridgeManager.java (from rev 65, trunk/utils/ipojo-metatype-bridge/src/main/java/net/sourceforge/ipojo_toolbox/utils/metatype_bridge/MetatypeBridge.java)
===================================================================
--- trunk/utils/ipojo-metatype-bridge/src/main/java/net/sourceforge/ipojo_toolbox/utils/metatype_bridge/MetatypeBridgeManager.java (rev 0)
+++ trunk/utils/ipojo-metatype-bridge/src/main/java/net/sourceforge/ipojo_toolbox/utils/metatype_bridge/MetatypeBridgeManager.java 2009-04-20 15:23:43 UTC (rev 66)
@@ -0,0 +1,74 @@
+package net.sourceforge.ipojo_toolbox.utils.metatype_bridge;
+
+import java.util.Collection;
+import java.util.Dictionary;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
+
+import org.apache.felix.ipojo.Factory;
+import org.apache.felix.ipojo.InstanceManager;
+import org.osgi.framework.Bundle;
+
+/**
+ * Creates on the fly ManagedServiceFactory implementing MetatypeProvider.
+ * The created MSF just delegates calls on the wrapped one.
+ */
+public class MetatypeBridgeManager {
+
+ /**
+ * Store created wrapper per iPOJO Factories.
+ */
+ private Map/*Factory, ComponentInstance<MetatypeBundleBridge>*/ m_bridges = new HashMap();
+
+ /**
+ * Wrapper Factory
+ */
+ private Factory m_wrapperFactory; // injected (only valid factories)
+
+ public synchronized void bindFactory(Factory factory) {
+ Bundle bundle = factory.getComponentDescription().getBundleContext().getBundle();
+ InstanceManager instance = (InstanceManager) m_bridges.get(factory);
+ if (instance == null) {
+ // Create a new instance for this factory
+ Dictionary prop = new Properties();
+ prop.put("bundle.id", new Long(bundle.getBundleId()));
+ prop.put("factory", factory);
+ prop.put("factory.name", factory.getName());
+ prop.put("service.pid", factory.getName()+ "-WRAPPER");
+
+ try {
+ instance = (InstanceManager) m_wrapperFactory.createComponentInstance(prop);
+ m_bridges.put(factory, instance);
+ } catch (Exception e) {
+ System.out.println("ERROR : Cannot create a bridge instance : "
+ + e.getMessage());
+ e.printStackTrace();
+ return;
+ }
+ }
+ }
+
+ public synchronized void unbindFactory(Factory factory) {
+ InstanceManager instance = (InstanceManager) m_bridges.remove(factory);
+ if (instance == null) {
+ // Ignore ...
+ return;
+ } else {
+ instance.dispose();
+ }
+
+ }
+
+ public void stop() {
+ // Cleanup
+ Collection instances = m_bridges.values();
+ Iterator it = instances.iterator();
+ while (it.hasNext()) {
+ ((InstanceManager) it.next()).dispose();
+ }
+ m_bridges.clear();
+ }
+
+}
Property changes on: trunk/utils/ipojo-metatype-bridge/src/main/java/net/sourceforge/ipojo_toolbox/utils/metatype_bridge/MetatypeBridgeManager.java
___________________________________________________________________
Added: svn:mergeinfo
+
Deleted: trunk/utils/ipojo-metatype-bridge/src/main/java/net/sourceforge/ipojo_toolbox/utils/metatype_bridge/MetatypeFactoryWrapper.java
===================================================================
--- trunk/utils/ipojo-metatype-bridge/src/main/java/net/sourceforge/ipojo_toolbox/utils/metatype_bridge/MetatypeFactoryWrapper.java 2009-04-20 09:15:10 UTC (rev 65)
+++ trunk/utils/ipojo-metatype-bridge/src/main/java/net/sourceforge/ipojo_toolbox/utils/metatype_bridge/MetatypeFactoryWrapper.java 2009-04-20 15:23:43 UTC (rev 66)
@@ -1,229 +0,0 @@
-package net.sourceforge.ipojo_toolbox.utils.metatype_bridge;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Dictionary;
-import java.util.List;
-
-import org.apache.felix.ipojo.IPojoFactory;
-import org.apache.felix.ipojo.architecture.ComponentTypeDescription;
-import org.apache.felix.ipojo.architecture.PropertyDescription;
-import org.osgi.service.cm.ConfigurationException;
-import org.osgi.service.cm.ManagedServiceFactory;
-import org.osgi.service.metatype.AttributeDefinition;
-import org.osgi.service.metatype.MetaTypeProvider;
-import org.osgi.service.metatype.ObjectClassDefinition;
-
-/**
- * ManagedServiceFactory wrapper.
- * This class delegates call to the wrapped managed service factory.
- * However, it provides a Metatype description for the factory configurations.
- */
-public class MetatypeFactoryWrapper implements MetaTypeProvider, ManagedServiceFactory {
-
- /**
- * Wrapped Factory.
- */
- private IPojoFactory m_factory; //Injected
-
- private class ObjectClassDefinitionImpl implements ObjectClassDefinition {
-
- private ComponentTypeDescription m_description;
-
- List m_attributes = new ArrayList();
-
- public ObjectClassDefinitionImpl(ComponentTypeDescription desc) {
- m_description = desc;
- PropertyDescription[] props = desc.getProperties();
- for (int i = 0; i < props.length; i++) {
- m_attributes.add(new AttributeDefinitionImpl(props[i], m_description.getName()));
- }
- }
-
- public AttributeDefinition[] getAttributeDefinitions(int filter) {
- List list = new ArrayList();
- switch(filter) {
- case ObjectClassDefinition.OPTIONAL :
- for (int i = 0; i < m_attributes.size(); i++) {
- AttributeDefinitionImpl att = (AttributeDefinitionImpl) m_attributes.get(i);
- if (! att.m_isImmutable && ! att.m_isMandatory) {
- list.add(att);
- }
- }
- break;
- case ObjectClassDefinition.REQUIRED:
- for (int i = 0; i < m_attributes.size(); i++) {
- AttributeDefinitionImpl att = (AttributeDefinitionImpl) m_attributes.get(i);
- if (! att.m_isImmutable && att.m_isMandatory) {
- list.add(att);
- }
- }
- break;
- default :
- for (int i = 0; i < m_attributes.size(); i++) {
- AttributeDefinitionImpl att = (AttributeDefinitionImpl) m_attributes.get(i);
- if (! att.m_isImmutable) {
- list.add(att);
- }
- }
- }
- return (AttributeDefinition[]) list.toArray(new AttributeDefinition[list.size()]);
- }
-
- public String getDescription() {
- return m_description.getName();
- }
-
- public String getID() {
- return m_description.getName();
- }
-
- public InputStream getIcon(int arg0) throws IOException {
- return null;
- }
-
- public String getName() {
- return m_description.getName();
- }
-
- }
-
- private class AttributeDefinitionImpl implements AttributeDefinition {
-
- private PropertyDescription m_desc;
- private String m_typeName;
-
- private int m_type;
- private int m_cardinality;
- private boolean m_isMandatory;
- private boolean m_isImmutable;
-
- public AttributeDefinitionImpl(PropertyDescription desc, String typeName) {
- m_desc = desc;
- m_typeName = typeName;
- m_isMandatory = desc.isMandatory();
- m_isImmutable = desc.isImmutable();
- String type = m_desc.getType();
- String internType = null;
- if (type.endsWith("[]")) {
- // Array
- m_cardinality = Integer.MAX_VALUE;
- int index = type.indexOf('[');
- internType = type.substring(0, index);
- } else if (type.equals(java.util.Vector.class.getName())) {
- m_cardinality = Integer.MIN_VALUE;
- internType = String.class.getName();
- } else {
- m_cardinality = 0;
- internType = type;
- }
- m_type = getTypeByInternType(internType);
- }
-
- private int getTypeByInternType(String internType) {
- //STRING,LONG,INTEGER, CHAR,BYTE,DOUBLE,FLOAT, BOOLEAN
-
- if (internType.equalsIgnoreCase("string") || internType.equals(String.class.getName())) {
- return AttributeDefinition.STRING;
- }
- if (internType.equals("boolean")) {
- return AttributeDefinition.BOOLEAN;
- }
- if (internType.equals("float")) {
- return AttributeDefinition.FLOAT;
- }
- if (internType.equals("double")) {
- return AttributeDefinition.DOUBLE;
- }
- if (internType.equals("byte")) {
- return AttributeDefinition.BYTE;
- }
- if (internType.equals("char")) {
- return AttributeDefinition.CHARACTER;
- }
- if (internType.equals("int")) {
- return AttributeDefinition.INTEGER;
- }
- if (internType.equals("long")) {
- return AttributeDefinition.LONG;
- }
- System.out.println("WARNING : Cannot determine the type of " + internType);
- return -1;
- }
-
- public int getCardinality() {
- return m_cardinality;
- }
-
- public String[] getDefaultValue() {
- if (m_desc.getValue() != null) {
- if (getCardinality() == 0) {
- return new String[] { m_desc.getValue() };
- } else if (m_cardinality > 0) {
- return org.apache.felix.ipojo.parser.ParseUtils.parseArrays(m_desc.getValue());
- } else if (m_cardinality < 0) {
- //TODO handle vector case
- return new String[] { m_desc.getValue() };
- }
- }
- return null;
- }
-
- public String getDescription() {
- return m_desc.getName();
- }
-
- public String getID() {
- return m_typeName + "-" + m_desc.getName();
-
- }
-
- public String getName() {
- return m_desc.getName();
- }
-
- public String[] getOptionLabels() {
- return null;
- }
-
- public String[] getOptionValues() {
- return null;
- }
-
- public int getType() {
- return m_type;
- }
-
- public String validate(String arg0) {
- return null; // No validation
- }
-
-
-
- }
-
- public void deleted(String arg0) {
- m_factory.deleted(arg0);
- }
-
- public String getName() {
- return m_factory.getName();
- }
-
- public void updated(String arg0, Dictionary arg1)
- throws ConfigurationException {
- m_factory.updated(arg0, arg1);
-
- }
-
- public String[] getLocales() {
- return null;
- }
-
- public ObjectClassDefinition getObjectClassDefinition(String id,
- String loc) {
- return new ObjectClassDefinitionImpl(m_factory.getComponentDescription());
- }
-
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bou...@us...> - 2009-04-20 09:15:12
|
Revision: 65
http://ipojo-toolbox.svn.sourceforge.net/ipojo-toolbox/?rev=65&view=rev
Author: bourretp
Date: 2009-04-20 09:15:10 +0000 (Mon, 20 Apr 2009)
Log Message:
-----------
+ Added License and Notice to the iPOJO-metatype bridge.
- Removed old documentation in the iPOJO-arch-equinox command.
Modified Paths:
--------------
trunk/pom/pom.xml
trunk/runtime/felix/NOTICE
trunk/runtime/felix/pom.xml
trunk/utils/ipojo-metatype-bridge/metadata.xml
trunk/utils/ipojo-metatype-bridge/pom.xml
Added Paths:
-----------
trunk/utils/ipojo-metatype-bridge/LICENSE
trunk/utils/ipojo-metatype-bridge/NOTICE
Removed Paths:
-------------
trunk/utils/arch-equinox/doc/
Modified: trunk/pom/pom.xml
===================================================================
--- trunk/pom/pom.xml 2009-04-18 17:46:24 UTC (rev 64)
+++ trunk/pom/pom.xml 2009-04-20 09:15:10 UTC (rev 65)
@@ -132,6 +132,7 @@
<id>build</id>
<!-- List of sub-projects -->
<modules>
+ <module>../utils/ipojo-metatype-bridge</module>
<module>../runtime/felix</module>
</modules>
</profile>
Modified: trunk/runtime/felix/NOTICE
===================================================================
--- trunk/runtime/felix/NOTICE 2009-04-18 17:46:24 UTC (rev 64)
+++ trunk/runtime/felix/NOTICE 2009-04-20 09:15:10 UTC (rev 65)
@@ -1,4 +1,4 @@
-iPOJO-Toolbox - iPOJO runtime environment
+iPOJO Toolbox : Felix runtime environment
Copyright 2009 \xC9quipe ADELE, Universit\xE9 Joseph Fourier
Modified: trunk/runtime/felix/pom.xml
===================================================================
--- trunk/runtime/felix/pom.xml 2009-04-18 17:46:24 UTC (rev 64)
+++ trunk/runtime/felix/pom.xml 2009-04-20 09:15:10 UTC (rev 65)
@@ -35,7 +35,7 @@
<packaging>pom</packaging>
<!-- Project's informations -->
- <name>iPOJO Toolbox : Felix runtime environment pack</name>
+ <name>iPOJO Toolbox : Felix runtime environment</name>
<description>Collection of Apache Felix and iPOJO bundles, grouped in a single archive, that provides a basic environment to run and manage iPOJO components.</description>
<url>http://ipojo-toolbox.wiki.sourceforge.net/iPOJO-runtime</url>
<inceptionYear>2009</inceptionYear>
Added: trunk/utils/ipojo-metatype-bridge/LICENSE
===================================================================
--- trunk/utils/ipojo-metatype-bridge/LICENSE (rev 0)
+++ trunk/utils/ipojo-metatype-bridge/LICENSE 2009-04-20 09:15:10 UTC (rev 65)
@@ -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: trunk/utils/ipojo-metatype-bridge/NOTICE
===================================================================
--- trunk/utils/ipojo-metatype-bridge/NOTICE (rev 0)
+++ trunk/utils/ipojo-metatype-bridge/NOTICE 2009-04-20 09:15:10 UTC (rev 65)
@@ -0,0 +1,25 @@
+iPOJO Toolbox : iPOJO Metatype Bridge
+Copyright 2009 \xC9quipe ADELE, Universit\xE9 Joseph Fourier
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+
+II. Used Software
+
+This product uses software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+
+III. License Summary
+- Apache License 2.0
Modified: trunk/utils/ipojo-metatype-bridge/metadata.xml
===================================================================
--- trunk/utils/ipojo-metatype-bridge/metadata.xml 2009-04-18 17:46:24 UTC (rev 64)
+++ trunk/utils/ipojo-metatype-bridge/metadata.xml 2009-04-20 09:15:10 UTC (rev 65)
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<!-- TODO !!! : Rename components type, instances and properties -->
<iPOJO>
<component className="net.sourceforge.ipojo_toolbox.utils.metatype_bridge.MetatypeBridge" architecture="true" public="false">
<requires filter="(factory.state=1)" optional="true" aggregate="true">
Modified: trunk/utils/ipojo-metatype-bridge/pom.xml
===================================================================
--- trunk/utils/ipojo-metatype-bridge/pom.xml 2009-04-18 17:46:24 UTC (rev 64)
+++ trunk/utils/ipojo-metatype-bridge/pom.xml 2009-04-20 09:15:10 UTC (rev 65)
@@ -1,11 +1,46 @@
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+
+ <!-- Project parent -->
+ <parent>
+ <groupId>net.sourceforge.ipojo-toolbox</groupId>
+ <artifactId>ipojo-toolbox</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../../pom/pom.xml</relativePath>
+ </parent>
+
+ <!-- Project coordinates -->
+ <groupId>net.sourceforge.ipojo-toolbox</groupId>
+ <artifactId>ipojo-metatype-bridge</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>bundle</packaging>
- <groupId>net.sourceforge.ipojo-toolbox.utils</groupId>
- <artifactId>ipojo-metatype-bridge</artifactId>
- <version>1.2.0</version>
- <name>iPOJO-Toolbox - iPOJO Metatype Bridge</name>
+
+ <!-- Project's informations -->
+ <name>iPOJO-Toolbox : iPOJO Metatype Bridge</name>
+ <description>TODO !!!</description>
+ <url>http://ipojo-toolbox.wiki.sourceforge.net/TODO !!!</url>
+ <inceptionYear>2009</inceptionYear>
+ <!-- Project dependencies -->
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -19,21 +54,26 @@
</dependency>
</dependencies>
+ <!-- Build configuration -->
<build>
<plugins>
+
+ <!-- Bundle generation config-->
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
+ <version>2.0.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Private-Package>
- net.sourceforge.ipojo_toolbox.utils.metatype_bridge
+ net.sourceforge.ipojo_toolbox.utils.metatype_bridge.*
</Private-Package>
</instructions>
</configuration>
</plugin>
+
+ <!-- iPOJO bundle manipulation configuration -->
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bou...@us...> - 2009-04-18 17:46:26
|
Revision: 64
http://ipojo-toolbox.svn.sourceforge.net/ipojo-toolbox/?rev=64&view=rev
Author: bourretp
Date: 2009-04-18 17:46:24 +0000 (Sat, 18 Apr 2009)
Log Message:
-----------
- Removing the runtime-1.2.0 release using a "disguised" snapshot version of org.apache.felix.http-jetty bundle. First official release should become felix-runtime-1.2.0
Removed Paths:
-------------
tags/runtime-1.2.0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bou...@us...> - 2009-04-18 17:42:13
|
Revision: 63
http://ipojo-toolbox.svn.sourceforge.net/ipojo-toolbox/?rev=63&view=rev
Author: bourretp
Date: 2009-04-18 17:42:11 +0000 (Sat, 18 Apr 2009)
Log Message:
-----------
iPOJO Felix runtime :
* Now including the newly released 1.0.0 version of the Apache Felix HTTP Service.
- Removed previous old http-jetty snapshot bundle.
Modified Paths:
--------------
trunk/runtime/felix/assembly.xml
trunk/runtime/felix/config.properties
trunk/runtime/felix/pom.xml
Removed Paths:
-------------
trunk/runtime/felix/lib/
Modified: trunk/runtime/felix/assembly.xml
===================================================================
--- trunk/runtime/felix/assembly.xml 2009-04-15 07:36:23 UTC (rev 62)
+++ trunk/runtime/felix/assembly.xml 2009-04-18 17:42:11 UTC (rev 63)
@@ -31,7 +31,6 @@
<excludes>
<exclude>pom.xml</exclude>
<exclude>assembly.xml</exclude>
- <exclude>lib/**</exclude>
<exclude>target/**</exclude>
<exclude>felix-cache/**</exclude>
</excludes>
Modified: trunk/runtime/felix/config.properties
===================================================================
--- trunk/runtime/felix/config.properties 2009-04-15 07:36:23 UTC (rev 62)
+++ trunk/runtime/felix/config.properties 2009-04-18 17:42:11 UTC (rev 63)
@@ -26,7 +26,7 @@
file:bundle/org.apache.felix.eventadmin-1.0.0.jar \
file:bundle/org.apache.felix.configadmin-1.0.10.jar \
file:bundle/org.apache.felix.metatype-1.0.2.jar \
- file:bundle/org.apache.felix.http.jetty-0.9.0.jar \
+ file:bundle/org.apache.felix.http.jetty-1.0.0.jar \
file:bundle/org.apache.felix.webconsole-1.2.8.jar \
file:bundle/org.apache.felix.ipojo-1.2.0.jar \
file:bundle/org.apache.felix.ipojo.composite-1.2.0.jar \
Modified: trunk/runtime/felix/pom.xml
===================================================================
--- trunk/runtime/felix/pom.xml 2009-04-15 07:36:23 UTC (rev 62)
+++ trunk/runtime/felix/pom.xml 2009-04-18 17:42:11 UTC (rev 63)
@@ -110,16 +110,11 @@
<version>1.0.2</version>
<scope>runtime</scope>
</dependency>
-
- <!-- As the Felix Jetty HTTP Service has never been released, we embeds a fake-released version of this bundle.
- TODO : replace this system dependency as soon as the Apache Felixh http.jetty bundle is released.
- -->
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.jetty</artifactId>
- <version>0.9.0</version>
- <scope>system</scope>
- <systemPath>${project.basedir}/lib/org.apache.felix.http.jetty-0.9.0.jar</systemPath>
+ <version>1.0.0</version>
+ <scope>runtime</scope>
</dependency>
<!-- iPOJO bundles -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bou...@us...> - 2009-04-15 07:36:25
|
Revision: 62
http://ipojo-toolbox.svn.sourceforge.net/ipojo-toolbox/?rev=62&view=rev
Author: bourretp
Date: 2009-04-15 07:36:23 +0000 (Wed, 15 Apr 2009)
Log Message:
-----------
* Modified equinox arch command pom to use iPOJO 1.2.0.
Modified Paths:
--------------
trunk/runtime/felix/pom.xml
trunk/utils/arch-equinox/pom.xml
Property Changed:
----------------
trunk/utils/arch-equinox/
Modified: trunk/runtime/felix/pom.xml
===================================================================
--- trunk/runtime/felix/pom.xml 2009-04-10 02:26:40 UTC (rev 61)
+++ trunk/runtime/felix/pom.xml 2009-04-15 07:36:23 UTC (rev 62)
@@ -35,7 +35,7 @@
<packaging>pom</packaging>
<!-- Project's informations -->
- <name>iPOJO-Toolbox : Felix runtime environment pack</name>
+ <name>iPOJO Toolbox : Felix runtime environment pack</name>
<description>Collection of Apache Felix and iPOJO bundles, grouped in a single archive, that provides a basic environment to run and manage iPOJO components.</description>
<url>http://ipojo-toolbox.wiki.sourceforge.net/iPOJO-runtime</url>
<inceptionYear>2009</inceptionYear>
Property changes on: trunk/utils/arch-equinox
___________________________________________________________________
Added: svn:ignore
+ target
Modified: trunk/utils/arch-equinox/pom.xml
===================================================================
--- trunk/utils/arch-equinox/pom.xml 2009-04-10 02:26:40 UTC (rev 61)
+++ trunk/utils/arch-equinox/pom.xml 2009-04-15 07:36:23 UTC (rev 62)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,67 +18,83 @@
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">
+ <modelVersion>4.0.0</modelVersion>
+
+ <!-- Project parent -->
<parent>
- <groupId>org.apache.felix</groupId>
- <artifactId>felix</artifactId>
- <version>1.0.2</version>
+ <groupId>net.sourceforge.ipojo-toolbox</groupId>
+ <artifactId>ipojo-toolbox</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../pom/pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
+ <!-- Project coordinates -->
+ <groupId>net.sourceforge.ipojo-toolbox</groupId>
+ <artifactId>equinox-arch-command</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
<packaging>bundle</packaging>
- <name>Apache iPOJO Arch Command for Eclipse Equinox</name>
- <artifactId>org.apache.felix.ipojo.arch.equinox</artifactId>
- <groupId>org.apache.felix</groupId>
- <version>0.9.0-SNAPSHOT</version>
+
+ <!-- Project's informations -->
+ <name>iPOJO Toolbox : iPOJO Arch command for Equinox</name>
+ <description>The Equinox version of the Apache Felix iPOJO Arch command.</description>
+ <url>http://ipojo-toolbox.wiki.sourceforge.net/Equinox</url>
+ <inceptionYear>2009</inceptionYear>
+
+ <!-- Give access to Eclipse artifacts -->
+ <repositories>
+ <repository>
+ <id>eclipse</id>
+ <url>http://repo1.maven.org/eclipse</url>
+ </repository>
+ </repositories>
+
+ <!-- Project dependencies -->
<dependencies>
+
+ <!-- iPOJO bundles -->
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.2.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.2.0</version>
</dependency>
+
+ <!-- Equinox -->
<dependency>
<groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<version>3.2.1</version>
</dependency>
</dependencies>
+
+ <!-- Build configuration -->
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <!-- TODO : add plugin management section to avoid to specify plugin version here. -->
+ <version>2.0.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-Name>
- iPOJO Arch Equinox Command
- </Bundle-Name>
- <Bundle-SymbolicName>
- ${pom.artifactId}
- </Bundle-SymbolicName>
- <Bundle-Vendor>
- The Apache Software Foundation
- </Bundle-Vendor>
- <Private-Package>
- org.apache.felix.ipojo.arch.equinox
- </Private-Package>
- <Include-Resource>
- META-INF/LICENCE=LICENSE,
- META-INF/NOTICE=NOTICE
- </Include-Resource>
+ <Bundle-Name>iPOJO Arch Equinox Command</Bundle-Name>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
+ <Private-Package>org.apache.felix.ipojo.arch.equinox</Private-Package>
+ <Include-Resource>META-INF/LICENCE=LICENSE, META-INF/NOTICE=NOTICE</Include-Resource>
</instructions>
</configuration>
</plugin>
+
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.2.0</version>
<executions>
<execution>
<goals>
@@ -91,12 +108,4 @@
</plugin>
</plugins>
</build>
- <repositories>
- <!-- Give access to Eclipse artifacts -->
- <repository>
- <id>eclipse</id>
- <url>http://repo1.maven.org/eclipse</url>
- </repository>
- </repositories>
-
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bou...@us...> - 2009-04-10 02:26:42
|
Revision: 61
http://ipojo-toolbox.svn.sourceforge.net/ipojo-toolbox/?rev=61&view=rev
Author: bourretp
Date: 2009-04-10 02:26:40 +0000 (Fri, 10 Apr 2009)
Log Message:
-----------
* Fixed parent pom file encoding to UTF-8.
Felix-runtime :
* Updated bundles version in the felix-runtime.
+ Added metatype bundle.
* Fixed pom encoding to UTF-8.
Modified Paths:
--------------
trunk/pom/pom.xml
trunk/runtime/felix/config.properties
trunk/runtime/felix/felix.bat
trunk/runtime/felix/felix.sh
trunk/runtime/felix/pom.xml
Modified: trunk/pom/pom.xml
===================================================================
--- trunk/pom/pom.xml 2009-04-09 16:59:42 UTC (rev 60)
+++ trunk/pom/pom.xml 2009-04-10 02:26:40 UTC (rev 61)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
Modified: trunk/runtime/felix/config.properties
===================================================================
--- trunk/runtime/felix/config.properties 2009-04-09 16:59:42 UTC (rev 60)
+++ trunk/runtime/felix/config.properties 2009-04-10 02:26:40 UTC (rev 61)
@@ -15,20 +15,19 @@
# specific language governing permissions and limitations
# under the License.
-# The log level for iPOJO
-ipojo.log.level=WARNING
-# Starts the bundles
+# Starts the following bundles at startup.
felix.auto.start.1= \
- file:bundle/org.apache.felix.shell-1.0.2.jar \
- file:bundle/org.apache.felix.shell.tui-1.0.2.jar \
- file:bundle/org.apache.felix.bundlerepository-1.2.1.jar \
+ file:bundle/org.apache.felix.shell-1.2.0.jar \
+ file:bundle/org.apache.felix.shell.tui-1.2.0.jar \
+ file:bundle/org.apache.felix.bundlerepository-1.4.0.jar \
file:bundle/org.osgi.compendium-1.2.0.jar \
file:bundle/org.apache.felix.log-1.0.0.jar \
file:bundle/org.apache.felix.eventadmin-1.0.0.jar \
file:bundle/org.apache.felix.configadmin-1.0.10.jar \
+ file:bundle/org.apache.felix.metatype-1.0.2.jar \
file:bundle/org.apache.felix.http.jetty-0.9.0.jar \
- file:bundle/org.apache.felix.webconsole-1.2.2.jar \
+ file:bundle/org.apache.felix.webconsole-1.2.8.jar \
file:bundle/org.apache.felix.ipojo-1.2.0.jar \
file:bundle/org.apache.felix.ipojo.composite-1.2.0.jar \
file:bundle/org.apache.felix.ipojo.arch-1.2.0.jar \
Modified: trunk/runtime/felix/felix.bat
===================================================================
--- trunk/runtime/felix/felix.bat 2009-04-09 16:59:42 UTC (rev 60)
+++ trunk/runtime/felix/felix.bat 2009-04-10 02:26:40 UTC (rev 61)
@@ -14,4 +14,4 @@
@REM KIND, either express or implied. See the License for the
@REM specific language governing permissions and limitations
@REM under the License.
-@java %* -Dfelix.config.properties=file:config.properties -jar bundle\org.apache.felix.main-1.4.1.jar
+@java %* -Dfelix.config.properties=file:config.properties -jar bundle\org.apache.felix.main-1.6.0.jar
Modified: trunk/runtime/felix/felix.sh
===================================================================
--- trunk/runtime/felix/felix.sh 2009-04-09 16:59:42 UTC (rev 60)
+++ trunk/runtime/felix/felix.sh 2009-04-10 02:26:40 UTC (rev 61)
@@ -17,4 +17,4 @@
# specific language governing permissions and limitations
# under the License.
#
-java $@ -Dfelix.config.properties="file:config.properties" -jar bundle/org.apache.felix.main-1.4.1.jar
+java $@ -Dfelix.config.properties="file:config.properties" -jar bundle/org.apache.felix.main-1.6.0.jar
Modified: trunk/runtime/felix/pom.xml
===================================================================
--- trunk/runtime/felix/pom.xml 2009-04-09 16:59:42 UTC (rev 60)
+++ trunk/runtime/felix/pom.xml 2009-04-10 02:26:40 UTC (rev 61)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -31,11 +31,11 @@
<!-- Project coordinates -->
<groupId>net.sourceforge.ipojo-toolbox</groupId>
<artifactId>felix-runtime</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.2.1-SNAPSHOT</version>
<packaging>pom</packaging>
<!-- Project's informations -->
- <name>iPOJO-Toolbox : Felix runtime environment</name>
+ <name>iPOJO-Toolbox : Felix runtime environment pack</name>
<description>Collection of Apache Felix and iPOJO bundles, grouped in a single archive, that provides a basic environment to run and manage iPOJO components.</description>
<url>http://ipojo-toolbox.wiki.sourceforge.net/iPOJO-runtime</url>
<inceptionYear>2009</inceptionYear>
@@ -53,25 +53,25 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.main</artifactId>
- <version>1.4.1</version>
+ <version>1.6.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.shell</artifactId>
- <version>1.0.2</version>
+ <version>1.2.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.shell.tui</artifactId>
- <version>1.0.2</version>
+ <version>1.2.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.bundlerepository</artifactId>
- <version>1.2.1</version>
+ <version>1.4.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -99,20 +99,29 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <!-- As the Felix Jetty HTTP Service has never been released, we embeds a fake-released version of this bundle. -->
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.jetty</artifactId>
- <version>0.9.0</version>
- <scope>system</scope>
- <systemPath>${project.basedir}/lib/org.apache.felix.http.jetty-0.9.0.jar</systemPath>
+ <artifactId>org.apache.felix.webconsole</artifactId>
+ <version>1.2.8</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.webconsole</artifactId>
- <version>1.2.2</version>
+ <artifactId>org.apache.felix.metatype</artifactId>
+ <version>1.0.2</version>
<scope>runtime</scope>
</dependency>
+ <!-- As the Felix Jetty HTTP Service has never been released, we embeds a fake-released version of this bundle.
+ TODO : replace this system dependency as soon as the Apache Felixh http.jetty bundle is released.
+ -->
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.jetty</artifactId>
+ <version>0.9.0</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/lib/org.apache.felix.http.jetty-0.9.0.jar</systemPath>
+ </dependency>
+
<!-- iPOJO bundles -->
<dependency>
<groupId>org.apache.felix</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bou...@us...> - 2009-04-09 16:59:46
|
Revision: 60
http://ipojo-toolbox.svn.sourceforge.net/ipojo-toolbox/?rev=60&view=rev
Author: bourretp
Date: 2009-04-09 16:59:42 +0000 (Thu, 09 Apr 2009)
Log Message:
-----------
* Modified the felix-runtime pom to inherit from the new development version of the parent pom.
Modified Paths:
--------------
trunk/runtime/felix/pom.xml
Property Changed:
----------------
trunk/pom/
Property changes on: trunk/pom
___________________________________________________________________
Added: svn:ignore
+ target
Modified: trunk/runtime/felix/pom.xml
===================================================================
--- trunk/runtime/felix/pom.xml 2009-04-09 16:41:56 UTC (rev 59)
+++ trunk/runtime/felix/pom.xml 2009-04-09 16:59:42 UTC (rev 60)
@@ -24,7 +24,7 @@
<parent>
<groupId>net.sourceforge.ipojo-toolbox</groupId>
<artifactId>ipojo-toolbox</artifactId>
- <version>0.9.9-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../pom/pom.xml</relativePath>
</parent>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bou...@us...> - 2009-04-09 16:42:05
|
Revision: 59
http://ipojo-toolbox.svn.sourceforge.net/ipojo-toolbox/?rev=59&view=rev
Author: bourretp
Date: 2009-04-09 16:41:56 +0000 (Thu, 09 Apr 2009)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/pom/pom.xml
Modified: trunk/pom/pom.xml
===================================================================
--- trunk/pom/pom.xml 2009-04-09 16:41:49 UTC (rev 58)
+++ trunk/pom/pom.xml 2009-04-09 16:41:56 UTC (rev 59)
@@ -23,7 +23,7 @@
<!-- Project coordinates -->
<groupId>net.sourceforge.ipojo-toolbox</groupId>
<artifactId>ipojo-toolbox</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<!-- Project's informations -->
@@ -64,8 +64,8 @@
<!-- Software configuration management -->
<scm>
- <url>http://ipojo-toolbox.svn.sourceforge.net/viewvc/ipojo-toolbox/tags/ipojo-toolbox-1.0.0</url>
- <connection>scm:svn:https://ipojo-toolbox.svn.sourceforge.net/svnroot/ipojo-toolbox/tags/ipojo-toolbox-1.0.0</connection>
+ <url>http://ipojo-toolbox.svn.sourceforge.net/viewvc/ipojo-toolbox/trunk/</url>
+ <connection>scm:svn:https://ipojo-toolbox.svn.sourceforge.net/svnroot/ipojo-toolbox/trunk/</connection>
</scm>
<!-- Issue tracking -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bou...@us...> - 2009-04-09 16:41:51
|
Revision: 58
http://ipojo-toolbox.svn.sourceforge.net/ipojo-toolbox/?rev=58&view=rev
Author: bourretp
Date: 2009-04-09 16:41:49 +0000 (Thu, 09 Apr 2009)
Log Message:
-----------
[maven-release-plugin] copy for tag ipojo-toolbox-1.0.0
Added Paths:
-----------
tags/ipojo-toolbox-1.0.0/
tags/ipojo-toolbox-1.0.0/pom.xml
Removed Paths:
-------------
tags/ipojo-toolbox-1.0.0/pom.xml
Deleted: tags/ipojo-toolbox-1.0.0/pom.xml
===================================================================
--- trunk/pom/pom.xml 2009-04-09 16:39:50 UTC (rev 56)
+++ tags/ipojo-toolbox-1.0.0/pom.xml 2009-04-09 16:41:49 UTC (rev 58)
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <!-- Project coordinates -->
- <groupId>net.sourceforge.ipojo-toolbox</groupId>
- <artifactId>ipojo-toolbox</artifactId>
- <version>0.9.9-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <!-- Project's informations -->
- <name>iPOJO Toolbox</name>
- <description>The iPOJO-Toolbox includes several projects to ease the conception and the use of components above the Apache Felix iPOJO framework. It contains several handlers, some standard OSGi services as well as an Eclipse plugin, and many other useful features.</description>
- <url>http://ipojo-toolbox.sourceforge.net/</url>
- <inceptionYear>2009</inceptionYear>
-
- <!-- Apache Software License declaration -->
- <licenses>
- <license>
- <name>Apache License - Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>manual</distribution>
- </license>
- </licenses>
-
- <!-- Organization informations -->
- <organization>
- <name>Équipe ADELE, Université Joseph Fourier</name>
- <url>http://www-adele.imag.fr/</url>
- </organization>
-
- <!-- The iPOJO Toolbox team. -->
- <developers>
- <developer>
- <id>bourretp</id>
- <name>Pierre Bourret</name>
- <organization>Équipe ADELE, Université Joseph Fourier</organization>
- <organizationUrl>http://www-adele.imag.fr/</organizationUrl>
- <roles>
- <role>architect</role>
- <role>developer</role>
- </roles>
- <timezone>+1</timezone>
- </developer>
- </developers>
-
- <!-- Software configuration management -->
- <scm>
- <url>http://ipojo-toolbox.svn.sourceforge.net/viewvc/ipojo-toolbox/trunk/</url>
- <connection>scm:svn:https://ipojo-toolbox.svn.sourceforge.net/svnroot/ipojo-toolbox/trunk/</connection>
- </scm>
-
- <!-- Issue tracking -->
- <issueManagement>
- <system>SourceForge.net Tracker</system>
- <url>http://sourceforge.net/tracker/?group_id=253916</url>
- </issueManagement>
-
- <!-- Mailing lists -->
- <mailingLists>
- <mailingList>
- <name>ipojo-toolbox-users</name>
- <post>ipo...@li...</post>
- <subscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-users</subscribe>
- <unsubscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-users</unsubscribe>
- <archive>https://sourceforge.net/mailarchive/forum.php?forum_name=ipojo-toolbox-users</archive>
- </mailingList>
- <mailingList>
- <name>ipojo-toolbox-commits</name>
- <post>ipo...@li...</post>
- <subscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-commits</subscribe>
- <unsubscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-commits</unsubscribe>
- <archive>https://sourceforge.net/mailarchive/forum.php?forum_name=ipojo-toolbox-commits</archive>
- </mailingList>
- </mailingLists>
-
- <!-- Distribution management -->
- <distributionManagement>
- <!-- The repository for released versions of iPOJO-toolbox artifacts-->
- <repository>
- <id>ipojo-toolbox-m2-repo</id>
- <name>iPOJO-Toolbox repository</name>
- <url>sftp://web.sourceforge.net/home/groups/i/ip/ipojo-toolbox/htdocs/m2-repo</url>
- <uniqueVersion>false</uniqueVersion>
- </repository>
- <!-- The repository for snapshots versions of iPOJO-toolbox artifacts-->
- <snapshotRepository>
- <id>ipojo-toolbox-m2-snapshot-repo</id>
- <name>iPOJO-Toolbox snapshots repository</name>
- <url>sftp://web.sourceforge.net/home/groups/i/ip/ipojo-toolbox/htdocs/m2-snapshot-repo</url>
- <uniqueVersion>true</uniqueVersion>
- </snapshotRepository>
- </distributionManagement>
-
- <!-- Build configuration -->
- <build>
- <plugins>
- <!-- iPOJO-Toolbox projects must compile and run on a Java1.3 environment, unless explicitely specified. -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.3</source>
- <target>1.3</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <!-- Build profiles -->
- <profiles>
- <!-- Profile used to build all iPOJO-Toolbox subprojects -->
- <profile>
- <id>build</id>
- <!-- List of sub-projects -->
- <modules>
- <module>../runtime/felix</module>
- </modules>
- </profile>
- </profiles>
-
-</project>
Copied: tags/ipojo-toolbox-1.0.0/pom.xml (from rev 57, trunk/pom/pom.xml)
===================================================================
--- tags/ipojo-toolbox-1.0.0/pom.xml (rev 0)
+++ tags/ipojo-toolbox-1.0.0/pom.xml 2009-04-09 16:41:49 UTC (rev 58)
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <!-- Project coordinates -->
+ <groupId>net.sourceforge.ipojo-toolbox</groupId>
+ <artifactId>ipojo-toolbox</artifactId>
+ <version>1.0.0</version>
+ <packaging>pom</packaging>
+
+ <!-- Project's informations -->
+ <name>iPOJO Toolbox</name>
+ <description>The iPOJO-Toolbox includes several projects to ease the conception and the use of components above the Apache Felix iPOJO framework. It contains several handlers, some standard OSGi services as well as an Eclipse plugin, and many other useful features.</description>
+ <url>http://ipojo-toolbox.sourceforge.net/</url>
+ <inceptionYear>2009</inceptionYear>
+
+ <!-- Apache Software License declaration -->
+ <licenses>
+ <license>
+ <name>Apache License - Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>manual</distribution>
+ </license>
+ </licenses>
+
+ <!-- Organization informations -->
+ <organization>
+ <name>Équipe ADELE, Université Joseph Fourier</name>
+ <url>http://www-adele.imag.fr/</url>
+ </organization>
+
+ <!-- The iPOJO Toolbox team. -->
+ <developers>
+ <developer>
+ <id>bourretp</id>
+ <name>Pierre Bourret</name>
+ <organization>Équipe ADELE, Université Joseph Fourier</organization>
+ <organizationUrl>http://www-adele.imag.fr/</organizationUrl>
+ <roles>
+ <role>architect</role>
+ <role>developer</role>
+ </roles>
+ <timezone>+1</timezone>
+ </developer>
+ </developers>
+
+ <!-- Software configuration management -->
+ <scm>
+ <url>http://ipojo-toolbox.svn.sourceforge.net/viewvc/ipojo-toolbox/tags/ipojo-toolbox-1.0.0</url>
+ <connection>scm:svn:https://ipojo-toolbox.svn.sourceforge.net/svnroot/ipojo-toolbox/tags/ipojo-toolbox-1.0.0</connection>
+ </scm>
+
+ <!-- Issue tracking -->
+ <issueManagement>
+ <system>SourceForge.net Tracker</system>
+ <url>http://sourceforge.net/tracker/?group_id=253916</url>
+ </issueManagement>
+
+ <!-- Mailing lists -->
+ <mailingLists>
+ <mailingList>
+ <name>ipojo-toolbox-users</name>
+ <post>ipo...@li...</post>
+ <subscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-users</subscribe>
+ <unsubscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-users</unsubscribe>
+ <archive>https://sourceforge.net/mailarchive/forum.php?forum_name=ipojo-toolbox-users</archive>
+ </mailingList>
+ <mailingList>
+ <name>ipojo-toolbox-commits</name>
+ <post>ipo...@li...</post>
+ <subscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-commits</subscribe>
+ <unsubscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-commits</unsubscribe>
+ <archive>https://sourceforge.net/mailarchive/forum.php?forum_name=ipojo-toolbox-commits</archive>
+ </mailingList>
+ </mailingLists>
+
+ <!-- Distribution management -->
+ <distributionManagement>
+ <!-- The repository for released versions of iPOJO-toolbox artifacts-->
+ <repository>
+ <id>ipojo-toolbox-m2-repo</id>
+ <name>iPOJO-Toolbox repository</name>
+ <url>sftp://web.sourceforge.net/home/groups/i/ip/ipojo-toolbox/htdocs/m2-repo</url>
+ <uniqueVersion>false</uniqueVersion>
+ </repository>
+ <!-- The repository for snapshots versions of iPOJO-toolbox artifacts-->
+ <snapshotRepository>
+ <id>ipojo-toolbox-m2-snapshot-repo</id>
+ <name>iPOJO-Toolbox snapshots repository</name>
+ <url>sftp://web.sourceforge.net/home/groups/i/ip/ipojo-toolbox/htdocs/m2-snapshot-repo</url>
+ <uniqueVersion>true</uniqueVersion>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <!-- Build configuration -->
+ <build>
+ <plugins>
+ <!-- iPOJO-Toolbox projects must compile and run on a Java1.3 environment, unless explicitely specified. -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.3</source>
+ <target>1.3</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!-- Build profiles -->
+ <profiles>
+ <!-- Profile used to build all iPOJO-Toolbox subprojects -->
+ <profile>
+ <id>build</id>
+ <!-- List of sub-projects -->
+ <modules>
+ <module>../runtime/felix</module>
+ </modules>
+ </profile>
+ </profiles>
+
+</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bou...@us...> - 2009-04-09 16:41:40
|
Revision: 57
http://ipojo-toolbox.svn.sourceforge.net/ipojo-toolbox/?rev=57&view=rev
Author: bourretp
Date: 2009-04-09 16:41:31 +0000 (Thu, 09 Apr 2009)
Log Message:
-----------
[maven-release-plugin] prepare release ipojo-toolbox-1.0.0
Modified Paths:
--------------
trunk/pom/pom.xml
Modified: trunk/pom/pom.xml
===================================================================
--- trunk/pom/pom.xml 2009-04-09 16:39:50 UTC (rev 56)
+++ trunk/pom/pom.xml 2009-04-09 16:41:31 UTC (rev 57)
@@ -23,7 +23,7 @@
<!-- Project coordinates -->
<groupId>net.sourceforge.ipojo-toolbox</groupId>
<artifactId>ipojo-toolbox</artifactId>
- <version>0.9.9-SNAPSHOT</version>
+ <version>1.0.0</version>
<packaging>pom</packaging>
<!-- Project's informations -->
@@ -64,8 +64,8 @@
<!-- Software configuration management -->
<scm>
- <url>http://ipojo-toolbox.svn.sourceforge.net/viewvc/ipojo-toolbox/trunk/</url>
- <connection>scm:svn:https://ipojo-toolbox.svn.sourceforge.net/svnroot/ipojo-toolbox/trunk/</connection>
+ <url>http://ipojo-toolbox.svn.sourceforge.net/viewvc/ipojo-toolbox/tags/ipojo-toolbox-1.0.0</url>
+ <connection>scm:svn:https://ipojo-toolbox.svn.sourceforge.net/svnroot/ipojo-toolbox/tags/ipojo-toolbox-1.0.0</connection>
</scm>
<!-- Issue tracking -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bou...@us...> - 2009-04-09 16:39:57
|
Revision: 56
http://ipojo-toolbox.svn.sourceforge.net/ipojo-toolbox/?rev=56&view=rev
Author: bourretp
Date: 2009-04-09 16:39:50 +0000 (Thu, 09 Apr 2009)
Log Message:
-----------
mvn release plugin error : manual recovery.
Removed Paths:
-------------
tags/ipojo-toolbox-parent-1.0.0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bou...@us...> - 2009-04-09 16:38:15
|
Revision: 55
http://ipojo-toolbox.svn.sourceforge.net/ipojo-toolbox/?rev=55&view=rev
Author: bourretp
Date: 2009-04-09 16:38:01 +0000 (Thu, 09 Apr 2009)
Log Message:
-----------
[maven-release-plugin] rollback the release of ipojo-toolbox-parent-1.0.0
Modified Paths:
--------------
trunk/pom/pom.xml
Modified: trunk/pom/pom.xml
===================================================================
--- trunk/pom/pom.xml 2009-04-09 16:36:07 UTC (rev 54)
+++ trunk/pom/pom.xml 2009-04-09 16:38:01 UTC (rev 55)
@@ -23,7 +23,7 @@
<!-- Project coordinates -->
<groupId>net.sourceforge.ipojo-toolbox</groupId>
<artifactId>ipojo-toolbox</artifactId>
- <version>1.0.0</version>
+ <version>0.9.9-SNAPSHOT</version>
<packaging>pom</packaging>
<!-- Project's informations -->
@@ -64,8 +64,8 @@
<!-- Software configuration management -->
<scm>
- <url>http://ipojo-toolbox.svn.sourceforge.net/viewvc/ipojo-toolbox/tags/ipojo-toolbox-parent-1.0.0</url>
- <connection>scm:svn:https://ipojo-toolbox.svn.sourceforge.net/svnroot/ipojo-toolbox/tags/ipojo-toolbox-parent-1.0.0</connection>
+ <url>http://ipojo-toolbox.svn.sourceforge.net/viewvc/ipojo-toolbox/trunk/</url>
+ <connection>scm:svn:https://ipojo-toolbox.svn.sourceforge.net/svnroot/ipojo-toolbox/trunk/</connection>
</scm>
<!-- Issue tracking -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bou...@us...> - 2009-04-09 16:36:21
|
Revision: 54
http://ipojo-toolbox.svn.sourceforge.net/ipojo-toolbox/?rev=54&view=rev
Author: bourretp
Date: 2009-04-09 16:36:07 +0000 (Thu, 09 Apr 2009)
Log Message:
-----------
[maven-release-plugin] copy for tag ipojo-toolbox-parent-1.0.0
Added Paths:
-----------
tags/ipojo-toolbox-parent-1.0.0/
tags/ipojo-toolbox-parent-1.0.0/pom.xml
Removed Paths:
-------------
tags/ipojo-toolbox-parent-1.0.0/pom.xml
Deleted: tags/ipojo-toolbox-parent-1.0.0/pom.xml
===================================================================
--- trunk/pom/pom.xml 2009-04-09 16:32:41 UTC (rev 52)
+++ tags/ipojo-toolbox-parent-1.0.0/pom.xml 2009-04-09 16:36:07 UTC (rev 54)
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <!-- Project coordinates -->
- <groupId>net.sourceforge.ipojo-toolbox</groupId>
- <artifactId>ipojo-toolbox</artifactId>
- <version>0.9.9-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <!-- Project's informations -->
- <name>iPOJO Toolbox</name>
- <description>The iPOJO-Toolbox includes several projects to ease the conception and the use of components above the Apache Felix iPOJO framework. It contains several handlers, some standard OSGi services as well as an Eclipse plugin, and many other useful features.</description>
- <url>http://ipojo-toolbox.sourceforge.net/</url>
- <inceptionYear>2009</inceptionYear>
-
- <!-- Apache Software License declaration -->
- <licenses>
- <license>
- <name>Apache License - Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>manual</distribution>
- </license>
- </licenses>
-
- <!-- Organization informations -->
- <organization>
- <name>Équipe ADELE, Université Joseph Fourier</name>
- <url>http://www-adele.imag.fr/</url>
- </organization>
-
- <!-- The iPOJO Toolbox team. -->
- <developers>
- <developer>
- <id>bourretp</id>
- <name>Pierre Bourret</name>
- <organization>Équipe ADELE, Université Joseph Fourier</organization>
- <organizationUrl>http://www-adele.imag.fr/</organizationUrl>
- <roles>
- <role>architect</role>
- <role>developer</role>
- </roles>
- <timezone>+1</timezone>
- </developer>
- </developers>
-
- <!-- Software configuration management -->
- <scm>
- <url>http://ipojo-toolbox.svn.sourceforge.net/viewvc/ipojo-toolbox/trunk/</url>
- <connection>scm:svn:https://ipojo-toolbox.svn.sourceforge.net/svnroot/ipojo-toolbox/trunk/</connection>
- </scm>
-
- <!-- Issue tracking -->
- <issueManagement>
- <system>SourceForge.net Tracker</system>
- <url>http://sourceforge.net/tracker/?group_id=253916</url>
- </issueManagement>
-
- <!-- Mailing lists -->
- <mailingLists>
- <mailingList>
- <name>ipojo-toolbox-users</name>
- <post>ipo...@li...</post>
- <subscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-users</subscribe>
- <unsubscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-users</unsubscribe>
- <archive>https://sourceforge.net/mailarchive/forum.php?forum_name=ipojo-toolbox-users</archive>
- </mailingList>
- <mailingList>
- <name>ipojo-toolbox-commits</name>
- <post>ipo...@li...</post>
- <subscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-commits</subscribe>
- <unsubscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-commits</unsubscribe>
- <archive>https://sourceforge.net/mailarchive/forum.php?forum_name=ipojo-toolbox-commits</archive>
- </mailingList>
- </mailingLists>
-
- <!-- Distribution management -->
- <distributionManagement>
- <!-- The repository for released versions of iPOJO-toolbox artifacts-->
- <repository>
- <id>ipojo-toolbox-m2-repo</id>
- <name>iPOJO-Toolbox repository</name>
- <url>sftp://web.sourceforge.net/home/groups/i/ip/ipojo-toolbox/htdocs/m2-repo</url>
- <uniqueVersion>false</uniqueVersion>
- </repository>
- <!-- The repository for snapshots versions of iPOJO-toolbox artifacts-->
- <snapshotRepository>
- <id>ipojo-toolbox-m2-snapshot-repo</id>
- <name>iPOJO-Toolbox snapshots repository</name>
- <url>sftp://web.sourceforge.net/home/groups/i/ip/ipojo-toolbox/htdocs/m2-snapshot-repo</url>
- <uniqueVersion>true</uniqueVersion>
- </snapshotRepository>
- </distributionManagement>
-
- <!-- Build configuration -->
- <build>
- <plugins>
- <!-- iPOJO-Toolbox projects must compile and run on a Java1.3 environment, unless explicitely specified. -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.3</source>
- <target>1.3</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <!-- Build profiles -->
- <profiles>
- <!-- Profile used to build all iPOJO-Toolbox subprojects -->
- <profile>
- <id>build</id>
- <!-- List of sub-projects -->
- <modules>
- <module>../runtime/felix</module>
- </modules>
- </profile>
- </profiles>
-
-</project>
Copied: tags/ipojo-toolbox-parent-1.0.0/pom.xml (from rev 53, trunk/pom/pom.xml)
===================================================================
--- tags/ipojo-toolbox-parent-1.0.0/pom.xml (rev 0)
+++ tags/ipojo-toolbox-parent-1.0.0/pom.xml 2009-04-09 16:36:07 UTC (rev 54)
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <!-- Project coordinates -->
+ <groupId>net.sourceforge.ipojo-toolbox</groupId>
+ <artifactId>ipojo-toolbox</artifactId>
+ <version>1.0.0</version>
+ <packaging>pom</packaging>
+
+ <!-- Project's informations -->
+ <name>iPOJO Toolbox</name>
+ <description>The iPOJO-Toolbox includes several projects to ease the conception and the use of components above the Apache Felix iPOJO framework. It contains several handlers, some standard OSGi services as well as an Eclipse plugin, and many other useful features.</description>
+ <url>http://ipojo-toolbox.sourceforge.net/</url>
+ <inceptionYear>2009</inceptionYear>
+
+ <!-- Apache Software License declaration -->
+ <licenses>
+ <license>
+ <name>Apache License - Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>manual</distribution>
+ </license>
+ </licenses>
+
+ <!-- Organization informations -->
+ <organization>
+ <name>Équipe ADELE, Université Joseph Fourier</name>
+ <url>http://www-adele.imag.fr/</url>
+ </organization>
+
+ <!-- The iPOJO Toolbox team. -->
+ <developers>
+ <developer>
+ <id>bourretp</id>
+ <name>Pierre Bourret</name>
+ <organization>Équipe ADELE, Université Joseph Fourier</organization>
+ <organizationUrl>http://www-adele.imag.fr/</organizationUrl>
+ <roles>
+ <role>architect</role>
+ <role>developer</role>
+ </roles>
+ <timezone>+1</timezone>
+ </developer>
+ </developers>
+
+ <!-- Software configuration management -->
+ <scm>
+ <url>http://ipojo-toolbox.svn.sourceforge.net/viewvc/ipojo-toolbox/tags/ipojo-toolbox-parent-1.0.0</url>
+ <connection>scm:svn:https://ipojo-toolbox.svn.sourceforge.net/svnroot/ipojo-toolbox/tags/ipojo-toolbox-parent-1.0.0</connection>
+ </scm>
+
+ <!-- Issue tracking -->
+ <issueManagement>
+ <system>SourceForge.net Tracker</system>
+ <url>http://sourceforge.net/tracker/?group_id=253916</url>
+ </issueManagement>
+
+ <!-- Mailing lists -->
+ <mailingLists>
+ <mailingList>
+ <name>ipojo-toolbox-users</name>
+ <post>ipo...@li...</post>
+ <subscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-users</subscribe>
+ <unsubscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-users</unsubscribe>
+ <archive>https://sourceforge.net/mailarchive/forum.php?forum_name=ipojo-toolbox-users</archive>
+ </mailingList>
+ <mailingList>
+ <name>ipojo-toolbox-commits</name>
+ <post>ipo...@li...</post>
+ <subscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-commits</subscribe>
+ <unsubscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-commits</unsubscribe>
+ <archive>https://sourceforge.net/mailarchive/forum.php?forum_name=ipojo-toolbox-commits</archive>
+ </mailingList>
+ </mailingLists>
+
+ <!-- Distribution management -->
+ <distributionManagement>
+ <!-- The repository for released versions of iPOJO-toolbox artifacts-->
+ <repository>
+ <id>ipojo-toolbox-m2-repo</id>
+ <name>iPOJO-Toolbox repository</name>
+ <url>sftp://web.sourceforge.net/home/groups/i/ip/ipojo-toolbox/htdocs/m2-repo</url>
+ <uniqueVersion>false</uniqueVersion>
+ </repository>
+ <!-- The repository for snapshots versions of iPOJO-toolbox artifacts-->
+ <snapshotRepository>
+ <id>ipojo-toolbox-m2-snapshot-repo</id>
+ <name>iPOJO-Toolbox snapshots repository</name>
+ <url>sftp://web.sourceforge.net/home/groups/i/ip/ipojo-toolbox/htdocs/m2-snapshot-repo</url>
+ <uniqueVersion>true</uniqueVersion>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <!-- Build configuration -->
+ <build>
+ <plugins>
+ <!-- iPOJO-Toolbox projects must compile and run on a Java1.3 environment, unless explicitely specified. -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.3</source>
+ <target>1.3</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!-- Build profiles -->
+ <profiles>
+ <!-- Profile used to build all iPOJO-Toolbox subprojects -->
+ <profile>
+ <id>build</id>
+ <!-- List of sub-projects -->
+ <modules>
+ <module>../runtime/felix</module>
+ </modules>
+ </profile>
+ </profiles>
+
+</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bou...@us...> - 2009-04-09 16:36:00
|
Revision: 53
http://ipojo-toolbox.svn.sourceforge.net/ipojo-toolbox/?rev=53&view=rev
Author: bourretp
Date: 2009-04-09 16:35:50 +0000 (Thu, 09 Apr 2009)
Log Message:
-----------
[maven-release-plugin] prepare release ipojo-toolbox-parent-1.0.0
Modified Paths:
--------------
trunk/pom/pom.xml
Modified: trunk/pom/pom.xml
===================================================================
--- trunk/pom/pom.xml 2009-04-09 16:32:41 UTC (rev 52)
+++ trunk/pom/pom.xml 2009-04-09 16:35:50 UTC (rev 53)
@@ -23,7 +23,7 @@
<!-- Project coordinates -->
<groupId>net.sourceforge.ipojo-toolbox</groupId>
<artifactId>ipojo-toolbox</artifactId>
- <version>0.9.9-SNAPSHOT</version>
+ <version>1.0.0</version>
<packaging>pom</packaging>
<!-- Project's informations -->
@@ -64,8 +64,8 @@
<!-- Software configuration management -->
<scm>
- <url>http://ipojo-toolbox.svn.sourceforge.net/viewvc/ipojo-toolbox/trunk/</url>
- <connection>scm:svn:https://ipojo-toolbox.svn.sourceforge.net/svnroot/ipojo-toolbox/trunk/</connection>
+ <url>http://ipojo-toolbox.svn.sourceforge.net/viewvc/ipojo-toolbox/tags/ipojo-toolbox-parent-1.0.0</url>
+ <connection>scm:svn:https://ipojo-toolbox.svn.sourceforge.net/svnroot/ipojo-toolbox/tags/ipojo-toolbox-parent-1.0.0</connection>
</scm>
<!-- Issue tracking -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bou...@us...> - 2009-04-09 16:32:51
|
Revision: 52
http://ipojo-toolbox.svn.sourceforge.net/ipojo-toolbox/?rev=52&view=rev
Author: bourretp
Date: 2009-04-09 16:32:41 +0000 (Thu, 09 Apr 2009)
Log Message:
-----------
* Moved parent pom in its own directory.
* Updated other poms to fit the new parent pom location.
Modified Paths:
--------------
trunk/runtime/felix/pom.xml
Added Paths:
-----------
trunk/pom/
trunk/pom/pom.xml
Removed Paths:
-------------
trunk/pom.xml
Copied: trunk/pom/pom.xml (from rev 51, trunk/pom.xml)
===================================================================
--- trunk/pom/pom.xml (rev 0)
+++ trunk/pom/pom.xml 2009-04-09 16:32:41 UTC (rev 52)
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <!-- Project coordinates -->
+ <groupId>net.sourceforge.ipojo-toolbox</groupId>
+ <artifactId>ipojo-toolbox</artifactId>
+ <version>0.9.9-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <!-- Project's informations -->
+ <name>iPOJO Toolbox</name>
+ <description>The iPOJO-Toolbox includes several projects to ease the conception and the use of components above the Apache Felix iPOJO framework. It contains several handlers, some standard OSGi services as well as an Eclipse plugin, and many other useful features.</description>
+ <url>http://ipojo-toolbox.sourceforge.net/</url>
+ <inceptionYear>2009</inceptionYear>
+
+ <!-- Apache Software License declaration -->
+ <licenses>
+ <license>
+ <name>Apache License - Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>manual</distribution>
+ </license>
+ </licenses>
+
+ <!-- Organization informations -->
+ <organization>
+ <name>Équipe ADELE, Université Joseph Fourier</name>
+ <url>http://www-adele.imag.fr/</url>
+ </organization>
+
+ <!-- The iPOJO Toolbox team. -->
+ <developers>
+ <developer>
+ <id>bourretp</id>
+ <name>Pierre Bourret</name>
+ <organization>Équipe ADELE, Université Joseph Fourier</organization>
+ <organizationUrl>http://www-adele.imag.fr/</organizationUrl>
+ <roles>
+ <role>architect</role>
+ <role>developer</role>
+ </roles>
+ <timezone>+1</timezone>
+ </developer>
+ </developers>
+
+ <!-- Software configuration management -->
+ <scm>
+ <url>http://ipojo-toolbox.svn.sourceforge.net/viewvc/ipojo-toolbox/trunk/</url>
+ <connection>scm:svn:https://ipojo-toolbox.svn.sourceforge.net/svnroot/ipojo-toolbox/trunk/</connection>
+ </scm>
+
+ <!-- Issue tracking -->
+ <issueManagement>
+ <system>SourceForge.net Tracker</system>
+ <url>http://sourceforge.net/tracker/?group_id=253916</url>
+ </issueManagement>
+
+ <!-- Mailing lists -->
+ <mailingLists>
+ <mailingList>
+ <name>ipojo-toolbox-users</name>
+ <post>ipo...@li...</post>
+ <subscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-users</subscribe>
+ <unsubscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-users</unsubscribe>
+ <archive>https://sourceforge.net/mailarchive/forum.php?forum_name=ipojo-toolbox-users</archive>
+ </mailingList>
+ <mailingList>
+ <name>ipojo-toolbox-commits</name>
+ <post>ipo...@li...</post>
+ <subscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-commits</subscribe>
+ <unsubscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-commits</unsubscribe>
+ <archive>https://sourceforge.net/mailarchive/forum.php?forum_name=ipojo-toolbox-commits</archive>
+ </mailingList>
+ </mailingLists>
+
+ <!-- Distribution management -->
+ <distributionManagement>
+ <!-- The repository for released versions of iPOJO-toolbox artifacts-->
+ <repository>
+ <id>ipojo-toolbox-m2-repo</id>
+ <name>iPOJO-Toolbox repository</name>
+ <url>sftp://web.sourceforge.net/home/groups/i/ip/ipojo-toolbox/htdocs/m2-repo</url>
+ <uniqueVersion>false</uniqueVersion>
+ </repository>
+ <!-- The repository for snapshots versions of iPOJO-toolbox artifacts-->
+ <snapshotRepository>
+ <id>ipojo-toolbox-m2-snapshot-repo</id>
+ <name>iPOJO-Toolbox snapshots repository</name>
+ <url>sftp://web.sourceforge.net/home/groups/i/ip/ipojo-toolbox/htdocs/m2-snapshot-repo</url>
+ <uniqueVersion>true</uniqueVersion>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <!-- Build configuration -->
+ <build>
+ <plugins>
+ <!-- iPOJO-Toolbox projects must compile and run on a Java1.3 environment, unless explicitely specified. -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.3</source>
+ <target>1.3</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!-- Build profiles -->
+ <profiles>
+ <!-- Profile used to build all iPOJO-Toolbox subprojects -->
+ <profile>
+ <id>build</id>
+ <!-- List of sub-projects -->
+ <modules>
+ <module>../runtime/felix</module>
+ </modules>
+ </profile>
+ </profiles>
+
+</project>
Property changes on: trunk/pom/pom.xml
___________________________________________________________________
Added: svn:mergeinfo
+
Deleted: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-04-09 16:27:28 UTC (rev 51)
+++ trunk/pom.xml 2009-04-09 16:32:41 UTC (rev 52)
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <!-- Project coordinates -->
- <groupId>net.sourceforge.ipojo-toolbox</groupId>
- <artifactId>ipojo-toolbox</artifactId>
- <version>0.9.9-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <!-- Project's informations -->
- <name>iPOJO Toolbox</name>
- <description>The iPOJO-Toolbox includes several projects to ease the conception and the use of components above the Apache Felix iPOJO framework. It contains several handlers, some standard OSGi services as well as an Eclipse plugin, and many other useful features.</description>
- <url>http://ipojo-toolbox.sourceforge.net/</url>
- <inceptionYear>2009</inceptionYear>
-
- <!-- Apache Software License declaration -->
- <licenses>
- <license>
- <name>Apache License - Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>manual</distribution>
- </license>
- </licenses>
-
- <!-- Organization informations -->
- <organization>
- <name>Équipe ADELE, Université Joseph Fourier</name>
- <url>http://www-adele.imag.fr/</url>
- </organization>
-
- <!-- The iPOJO Toolbox team. -->
- <developers>
- <developer>
- <id>bourretp</id>
- <name>Pierre Bourret</name>
- <organization>Équipe ADELE, Université Joseph Fourier</organization>
- <organizationUrl>http://www-adele.imag.fr/</organizationUrl>
- <roles>
- <role>architect</role>
- <role>developer</role>
- </roles>
- <timezone>+1</timezone>
- </developer>
- </developers>
-
- <!-- Software configuration management -->
- <scm>
- <url>http://ipojo-toolbox.svn.sourceforge.net/viewvc/ipojo-toolbox/trunk/</url>
- <connection>scm:svn:https://ipojo-toolbox.svn.sourceforge.net/svnroot/ipojo-toolbox/trunk/</connection>
- </scm>
-
- <!-- Issue tracking -->
- <issueManagement>
- <system>SourceForge.net Tracker</system>
- <url>http://sourceforge.net/tracker/?group_id=253916</url>
- </issueManagement>
-
- <!-- Mailing lists -->
- <mailingLists>
- <mailingList>
- <name>ipojo-toolbox-users</name>
- <post>ipo...@li...</post>
- <subscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-users</subscribe>
- <unsubscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-users</unsubscribe>
- <archive>https://sourceforge.net/mailarchive/forum.php?forum_name=ipojo-toolbox-users</archive>
- </mailingList>
- <mailingList>
- <name>ipojo-toolbox-commits</name>
- <post>ipo...@li...</post>
- <subscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-commits</subscribe>
- <unsubscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-commits</unsubscribe>
- <archive>https://sourceforge.net/mailarchive/forum.php?forum_name=ipojo-toolbox-commits</archive>
- </mailingList>
- </mailingLists>
-
- <!-- Distribution management -->
- <distributionManagement>
- <!-- The repository for released versions of iPOJO-toolbox artifacts-->
- <repository>
- <id>ipojo-toolbox-m2-repo</id>
- <name>iPOJO-Toolbox repository</name>
- <url>sftp://web.sourceforge.net/home/groups/i/ip/ipojo-toolbox/htdocs/m2-repo</url>
- <uniqueVersion>false</uniqueVersion>
- </repository>
- <!-- The repository for snapshots versions of iPOJO-toolbox artifacts-->
- <snapshotRepository>
- <id>ipojo-toolbox-m2-snapshot-repo</id>
- <name>iPOJO-Toolbox snapshots repository</name>
- <url>sftp://web.sourceforge.net/home/groups/i/ip/ipojo-toolbox/htdocs/m2-snapshot-repo</url>
- <uniqueVersion>true</uniqueVersion>
- </snapshotRepository>
- </distributionManagement>
-
- <!-- Build configuration -->
- <build>
- <plugins>
- <!-- iPOJO-Toolbox projects must compile and run on a Java1.3 environment, unless explicitely specified. -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.3</source>
- <target>1.3</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <!-- Build profiles -->
- <profiles>
- <!-- Profile used to build all iPOJO-Toolbox subprojects -->
- <profile>
- <id>build</id>
- <!-- List of sub-projects -->
- <modules>
- <module>runtime/felix</module>
- </modules>
- </profile>
- </profiles>
-
-</project>
Modified: trunk/runtime/felix/pom.xml
===================================================================
--- trunk/runtime/felix/pom.xml 2009-04-09 16:27:28 UTC (rev 51)
+++ trunk/runtime/felix/pom.xml 2009-04-09 16:32:41 UTC (rev 52)
@@ -25,6 +25,7 @@
<groupId>net.sourceforge.ipojo-toolbox</groupId>
<artifactId>ipojo-toolbox</artifactId>
<version>0.9.9-SNAPSHOT</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<!-- Project coordinates -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bou...@us...> - 2009-04-09 16:27:38
|
Revision: 51
http://ipojo-toolbox.svn.sourceforge.net/ipojo-toolbox/?rev=51&view=rev
Author: bourretp
Date: 2009-04-09 16:27:28 +0000 (Thu, 09 Apr 2009)
Log Message:
-----------
[maven-release-plugin] rollback the release of ipojo-toolbox-1.0.0
Modified Paths:
--------------
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-04-09 16:22:34 UTC (rev 50)
+++ trunk/pom.xml 2009-04-09 16:27:28 UTC (rev 51)
@@ -23,7 +23,7 @@
<!-- Project coordinates -->
<groupId>net.sourceforge.ipojo-toolbox</groupId>
<artifactId>ipojo-toolbox</artifactId>
- <version>1.0.0</version>
+ <version>0.9.9-SNAPSHOT</version>
<packaging>pom</packaging>
<!-- Project's informations -->
@@ -64,8 +64,8 @@
<!-- Software configuration management -->
<scm>
- <url>http://ipojo-toolbox.svn.sourceforge.net/viewvc/ipojo-toolbox/tags/ipojo-toolbox-1.0.0</url>
- <connection>scm:svn:https://ipojo-toolbox.svn.sourceforge.net/svnroot/ipojo-toolbox/tags/ipojo-toolbox-1.0.0</connection>
+ <url>http://ipojo-toolbox.svn.sourceforge.net/viewvc/ipojo-toolbox/trunk/</url>
+ <connection>scm:svn:https://ipojo-toolbox.svn.sourceforge.net/svnroot/ipojo-toolbox/trunk/</connection>
</scm>
<!-- Issue tracking -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bou...@us...> - 2009-04-09 16:22:44
|
Revision: 50
http://ipojo-toolbox.svn.sourceforge.net/ipojo-toolbox/?rev=50&view=rev
Author: bourretp
Date: 2009-04-09 16:22:34 +0000 (Thu, 09 Apr 2009)
Log Message:
-----------
[maven-release-plugin] prepare release ipojo-toolbox-1.0.0
Modified Paths:
--------------
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-04-09 16:17:21 UTC (rev 49)
+++ trunk/pom.xml 2009-04-09 16:22:34 UTC (rev 50)
@@ -23,7 +23,7 @@
<!-- Project coordinates -->
<groupId>net.sourceforge.ipojo-toolbox</groupId>
<artifactId>ipojo-toolbox</artifactId>
- <version>0.9.9-SNAPSHOT</version>
+ <version>1.0.0</version>
<packaging>pom</packaging>
<!-- Project's informations -->
@@ -64,8 +64,8 @@
<!-- Software configuration management -->
<scm>
- <url>http://ipojo-toolbox.svn.sourceforge.net/viewvc/ipojo-toolbox/trunk/</url>
- <connection>scm:svn:https://ipojo-toolbox.svn.sourceforge.net/svnroot/ipojo-toolbox/trunk/</connection>
+ <url>http://ipojo-toolbox.svn.sourceforge.net/viewvc/ipojo-toolbox/tags/ipojo-toolbox-1.0.0</url>
+ <connection>scm:svn:https://ipojo-toolbox.svn.sourceforge.net/svnroot/ipojo-toolbox/tags/ipojo-toolbox-1.0.0</connection>
</scm>
<!-- Issue tracking -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bou...@us...> - 2009-04-09 16:17:42
|
Revision: 49
http://ipojo-toolbox.svn.sourceforge.net/ipojo-toolbox/?rev=49&view=rev
Author: bourretp
Date: 2009-04-09 16:17:21 +0000 (Thu, 09 Apr 2009)
Log Message:
-----------
* Fixed a naughty bug in the felix-runtime pom : missing </parent> tag.
Modified Paths:
--------------
trunk/runtime/felix/pom.xml
Modified: trunk/runtime/felix/pom.xml
===================================================================
--- trunk/runtime/felix/pom.xml 2009-04-09 16:12:40 UTC (rev 48)
+++ trunk/runtime/felix/pom.xml 2009-04-09 16:17:21 UTC (rev 49)
@@ -25,7 +25,7 @@
<groupId>net.sourceforge.ipojo-toolbox</groupId>
<artifactId>ipojo-toolbox</artifactId>
<version>0.9.9-SNAPSHOT</version>
- <parent>
+ </parent>
<!-- Project coordinates -->
<groupId>net.sourceforge.ipojo-toolbox</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bou...@us...> - 2009-04-09 16:12:50
|
Revision: 48
http://ipojo-toolbox.svn.sourceforge.net/ipojo-toolbox/?rev=48&view=rev
Author: bourretp
Date: 2009-04-09 16:12:40 +0000 (Thu, 09 Apr 2009)
Log Message:
-----------
+ Added parent pom, containing global description and configuration.
* Updated felix-runtime pom : declaring the project as a child of the globel pom.
Modified Paths:
--------------
trunk/runtime/felix/pom.xml
Added Paths:
-----------
trunk/pom.xml
Property Changed:
----------------
trunk/
Property changes on: trunk
___________________________________________________________________
Added: svn:ignore
+ target
Added: trunk/pom.xml
===================================================================
--- trunk/pom.xml (rev 0)
+++ trunk/pom.xml 2009-04-09 16:12:40 UTC (rev 48)
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <!-- Project coordinates -->
+ <groupId>net.sourceforge.ipojo-toolbox</groupId>
+ <artifactId>ipojo-toolbox</artifactId>
+ <version>0.9.9-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <!-- Project's informations -->
+ <name>iPOJO Toolbox</name>
+ <description>The iPOJO-Toolbox includes several projects to ease the conception and the use of components above the Apache Felix iPOJO framework. It contains several handlers, some standard OSGi services as well as an Eclipse plugin, and many other useful features.</description>
+ <url>http://ipojo-toolbox.sourceforge.net/</url>
+ <inceptionYear>2009</inceptionYear>
+
+ <!-- Apache Software License declaration -->
+ <licenses>
+ <license>
+ <name>Apache License - Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>manual</distribution>
+ </license>
+ </licenses>
+
+ <!-- Organization informations -->
+ <organization>
+ <name>Équipe ADELE, Université Joseph Fourier</name>
+ <url>http://www-adele.imag.fr/</url>
+ </organization>
+
+ <!-- The iPOJO Toolbox team. -->
+ <developers>
+ <developer>
+ <id>bourretp</id>
+ <name>Pierre Bourret</name>
+ <organization>Équipe ADELE, Université Joseph Fourier</organization>
+ <organizationUrl>http://www-adele.imag.fr/</organizationUrl>
+ <roles>
+ <role>architect</role>
+ <role>developer</role>
+ </roles>
+ <timezone>+1</timezone>
+ </developer>
+ </developers>
+
+ <!-- Software configuration management -->
+ <scm>
+ <url>http://ipojo-toolbox.svn.sourceforge.net/viewvc/ipojo-toolbox/trunk/</url>
+ <connection>scm:svn:https://ipojo-toolbox.svn.sourceforge.net/svnroot/ipojo-toolbox/trunk/</connection>
+ </scm>
+
+ <!-- Issue tracking -->
+ <issueManagement>
+ <system>SourceForge.net Tracker</system>
+ <url>http://sourceforge.net/tracker/?group_id=253916</url>
+ </issueManagement>
+
+ <!-- Mailing lists -->
+ <mailingLists>
+ <mailingList>
+ <name>ipojo-toolbox-users</name>
+ <post>ipo...@li...</post>
+ <subscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-users</subscribe>
+ <unsubscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-users</unsubscribe>
+ <archive>https://sourceforge.net/mailarchive/forum.php?forum_name=ipojo-toolbox-users</archive>
+ </mailingList>
+ <mailingList>
+ <name>ipojo-toolbox-commits</name>
+ <post>ipo...@li...</post>
+ <subscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-commits</subscribe>
+ <unsubscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-commits</unsubscribe>
+ <archive>https://sourceforge.net/mailarchive/forum.php?forum_name=ipojo-toolbox-commits</archive>
+ </mailingList>
+ </mailingLists>
+
+ <!-- Distribution management -->
+ <distributionManagement>
+ <!-- The repository for released versions of iPOJO-toolbox artifacts-->
+ <repository>
+ <id>ipojo-toolbox-m2-repo</id>
+ <name>iPOJO-Toolbox repository</name>
+ <url>sftp://web.sourceforge.net/home/groups/i/ip/ipojo-toolbox/htdocs/m2-repo</url>
+ <uniqueVersion>false</uniqueVersion>
+ </repository>
+ <!-- The repository for snapshots versions of iPOJO-toolbox artifacts-->
+ <snapshotRepository>
+ <id>ipojo-toolbox-m2-snapshot-repo</id>
+ <name>iPOJO-Toolbox snapshots repository</name>
+ <url>sftp://web.sourceforge.net/home/groups/i/ip/ipojo-toolbox/htdocs/m2-snapshot-repo</url>
+ <uniqueVersion>true</uniqueVersion>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <!-- Build configuration -->
+ <build>
+ <plugins>
+ <!-- iPOJO-Toolbox projects must compile and run on a Java1.3 environment, unless explicitely specified. -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.3</source>
+ <target>1.3</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!-- Build profiles -->
+ <profiles>
+ <!-- Profile used to build all iPOJO-Toolbox subprojects -->
+ <profile>
+ <id>build</id>
+ <!-- List of sub-projects -->
+ <modules>
+ <module>runtime/felix</module>
+ </modules>
+ </profile>
+ </profiles>
+
+</project>
Modified: trunk/runtime/felix/pom.xml
===================================================================
--- trunk/runtime/felix/pom.xml 2009-04-08 16:16:11 UTC (rev 47)
+++ trunk/runtime/felix/pom.xml 2009-04-09 16:12:40 UTC (rev 48)
@@ -20,96 +20,31 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <!-- Project parent -->
+ <parent>
+ <groupId>net.sourceforge.ipojo-toolbox</groupId>
+ <artifactId>ipojo-toolbox</artifactId>
+ <version>0.9.9-SNAPSHOT</version>
+ <parent>
+
<!-- Project coordinates -->
<groupId>net.sourceforge.ipojo-toolbox</groupId>
- <artifactId>runtime</artifactId>
+ <artifactId>felix-runtime</artifactId>
<version>1.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
<!-- Project's informations -->
- <name>iPOJO-Toolbox - iPOJO runtime environment</name>
- <description>Collection of Apache Felix and iPOJO bundles, grouped in a single archive, that provides a base environment to run and manage iPOJO components.</description>
+ <name>iPOJO-Toolbox : Felix runtime environment</name>
+ <description>Collection of Apache Felix and iPOJO bundles, grouped in a single archive, that provides a basic environment to run and manage iPOJO components.</description>
<url>http://ipojo-toolbox.wiki.sourceforge.net/iPOJO-runtime</url>
<inceptionYear>2009</inceptionYear>
- <!-- Organization informations -->
- <organization>
- <name>Équipe ADELE, Université Joseph Fourier</name>
- <url>http://www-adele.imag.fr/</url>
- </organization>
+ <!-- Project properties -->
+ <properties>
+ <!-- The target directory containing all dependency bundles. -->
+ <bundle.target.dir>bundle</bundle.target.dir>
+ </properties>
- <!-- Developers informations -->
- <developers>
- <developer>
- <id>bourretp</id>
- <name>Pierre Bourret</name>
- <organization>Équipe ADELE, Université Joseph Fourier</organization>
- <organizationUrl>http://www-adele.imag.fr/</organizationUrl>
- <roles>
- <role>architect</role>
- <role>developer</role>
- </roles>
- <timezone>+1</timezone>
- </developer>
- </developers>
-
-
- <!-- License informations -->
- <licenses>
- <license>
- <name>Apache License - Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>manual</distribution>
- <comments />
- </license>
- </licenses>
-
- <!-- Software configuration management -->
- <scm>
- <connection>scm:svn:https://ipojo-toolbox.svn.sourceforge.net/svnroot/ipojo-toolbox/trunk/runtime/</connection>
- <url>http://ipojo-toolbox.svn.sourceforge.net/viewvc/ipojo-toolbox/trunk/runtime/</url>
- </scm>
-
- <!-- Issue tracking -->
- <issueManagement>
- <system>SourceForge.net Tracker</system>
- <url>http://sourceforge.net/tracker/?group_id=253916</url>
- </issueManagement>
-
- <!-- Mailing lists -->
- <mailingLists>
- <mailingList>
- <name>ipojo-toolbox-users</name>
- <post>ipo...@li...</post>
- <subscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-users</subscribe>
- <unsubscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-users</unsubscribe>
- <archive>https://sourceforge.net/mailarchive/forum.php?forum_name=ipojo-toolbox-users</archive>
- </mailingList>
- <mailingList>
- <name>ipojo-toolbox-commits</name>
- <post>ipo...@li...</post>
- <subscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-commits</subscribe>
- <unsubscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-commits</unsubscribe>
- <archive>https://sourceforge.net/mailarchive/forum.php?forum_name=ipojo-toolbox-commits</archive>
- </mailingList>
- </mailingLists>
-
- <!-- Distribution management -->
- <distributionManagement>
- <repository>
- <id>ipojo-toolbox-m2-repo</id>
- <name>iPOJO-Toolbox repository</name>
- <url>sftp://web.sourceforge.net/home/groups/i/ip/ipojo-toolbox/htdocs/m2-repo</url>
- <uniqueVersion>false</uniqueVersion>
- </repository>
- <snapshotRepository>
- <id>ipojo-toolbox-m2-snapshot-repo</id>
- <name>iPOJO-Toolbox snapshots repository</name>
- <url>sftp://web.sourceforge.net/home/groups/i/ip/ipojo-toolbox/htdocs/m2-snapshot-repo</url>
- <uniqueVersion>true</uniqueVersion>
- </snapshotRepository>
- </distributionManagement>
-
<!-- Project dependencies -->
<dependencies>
@@ -228,12 +163,6 @@
</dependency>
</dependencies>
- <!-- Project properties -->
- <properties>
- <!-- The target directory containing all dependency bundles. -->
- <bundle.target.dir>bundle</bundle.target.dir>
- </properties>
-
<!-- Build configuration -->
<build>
<plugins>
@@ -293,7 +222,6 @@
</filesets>
</configuration>
</plugin>
-
</plugins>
</build>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bou...@us...> - 2009-04-08 16:16:19
|
Revision: 47
http://ipojo-toolbox.svn.sourceforge.net/ipojo-toolbox/?rev=47&view=rev
Author: bourretp
Date: 2009-04-08 16:16:11 +0000 (Wed, 08 Apr 2009)
Log Message:
-----------
* Restructuring the trunk (Part 2/2).
Added Paths:
-----------
trunk/runtime/
trunk/runtime/felix/
Removed Paths:
-------------
trunk/felix/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bou...@us...> - 2009-04-08 15:58:35
|
Revision: 46
http://ipojo-toolbox.svn.sourceforge.net/ipojo-toolbox/?rev=46&view=rev
Author: bourretp
Date: 2009-04-08 15:58:11 +0000 (Wed, 08 Apr 2009)
Log Message:
-----------
+ Added (roughly) the equinox commands for junit4osgi and arch.
* Restructuring the trunk (Part 1/2).
Added Paths:
-----------
trunk/eclipse/
trunk/eclipse/ipojo-plugin/
trunk/felix/
trunk/felix/NOTICE
trunk/felix/config.properties
trunk/felix/pom.xml
trunk/utils/arch-equinox/
trunk/utils/arch-equinox/LICENSE
trunk/utils/arch-equinox/NOTICE
trunk/utils/arch-equinox/doc/
trunk/utils/arch-equinox/doc/architecture-handler.html
trunk/utils/arch-equinox/doc/changelog.txt
trunk/utils/arch-equinox/doc/media.data/
trunk/utils/arch-equinox/doc/media.data/apache.png
trunk/utils/arch-equinox/doc/media.data/gradient.png
trunk/utils/arch-equinox/doc/media.data/logo.png
trunk/utils/arch-equinox/doc/media.data/site.css
trunk/utils/arch-equinox/pom.xml
trunk/utils/arch-equinox/src/
trunk/utils/arch-equinox/src/main/
trunk/utils/arch-equinox/src/main/java/
trunk/utils/arch-equinox/src/main/java/org/
trunk/utils/arch-equinox/src/main/java/org/apache/
trunk/utils/arch-equinox/src/main/java/org/apache/felix/
trunk/utils/arch-equinox/src/main/java/org/apache/felix/ipojo/
trunk/utils/arch-equinox/src/main/java/org/apache/felix/ipojo/arch/
trunk/utils/arch-equinox/src/main/java/org/apache/felix/ipojo/arch/equinox/
trunk/utils/arch-equinox/src/main/java/org/apache/felix/ipojo/arch/equinox/ArchEquinox.java
trunk/utils/arch-equinox/src/main/resources/
trunk/utils/arch-equinox/src/main/resources/metadata.xml
trunk/utils/junit4osgi-equinox/
trunk/utils/junit4osgi-equinox/.checkstyle
trunk/utils/junit4osgi-equinox/.classpath
trunk/utils/junit4osgi-equinox/.externalToolBuilders/
trunk/utils/junit4osgi-equinox/.externalToolBuilders/Maven_Ant_Builder.launch
trunk/utils/junit4osgi-equinox/.externalToolBuilders/com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder.launch
trunk/utils/junit4osgi-equinox/.project
trunk/utils/junit4osgi-equinox/.settings/
trunk/utils/junit4osgi-equinox/.settings/org.eclipse.jdt.core.prefs
trunk/utils/junit4osgi-equinox/LICENSE
trunk/utils/junit4osgi-equinox/NOTICE
trunk/utils/junit4osgi-equinox/pom.xml
trunk/utils/junit4osgi-equinox/src/
trunk/utils/junit4osgi-equinox/src/main/
trunk/utils/junit4osgi-equinox/src/main/java/
trunk/utils/junit4osgi-equinox/src/main/java/org/
trunk/utils/junit4osgi-equinox/src/main/java/org/apache/
trunk/utils/junit4osgi-equinox/src/main/java/org/apache/felix/
trunk/utils/junit4osgi-equinox/src/main/java/org/apache/felix/ipojo/
trunk/utils/junit4osgi-equinox/src/main/java/org/apache/felix/ipojo/junit4osgi/
trunk/utils/junit4osgi-equinox/src/main/java/org/apache/felix/ipojo/junit4osgi/equinox/
trunk/utils/junit4osgi-equinox/src/main/java/org/apache/felix/ipojo/junit4osgi/equinox/JunitEquinox.java
trunk/utils/junit4osgi-equinox/src/main/resources/
trunk/utils/junit4osgi-equinox/src/main/resources/metadata.xml
Removed Paths:
-------------
trunk/felix/NOTICE
trunk/felix/config.properties
trunk/felix/pom.xml
trunk/ipojo-eclipse-plugin/
trunk/runtime/
Property changes on: trunk/eclipse/ipojo-plugin
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: trunk/felix
___________________________________________________________________
Added: svn:ignore
+ bundle
target
felix-cache
Added: svn:mergeinfo
+
Deleted: trunk/felix/NOTICE
===================================================================
--- trunk/runtime/NOTICE 2009-03-04 16:34:43 UTC (rev 44)
+++ trunk/felix/NOTICE 2009-04-08 15:58:11 UTC (rev 46)
@@ -1,25 +0,0 @@
-iPOJO-Toolbox - iPOJO runtime environment
-Copyright 2009 Equipe ADELE, Universit\xE9 Joseph Fourier
-
-
-I. Included Software
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-
-II. Used Software
-
-This product uses software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2007).
-Licensed under the Apache License 2.0.
-
-
-III. License Summary
-- Apache License 2.0
Copied: trunk/felix/NOTICE (from rev 45, trunk/runtime/NOTICE)
===================================================================
--- trunk/felix/NOTICE (rev 0)
+++ trunk/felix/NOTICE 2009-04-08 15:58:11 UTC (rev 46)
@@ -0,0 +1,25 @@
+iPOJO-Toolbox - iPOJO runtime environment
+Copyright 2009 \xC9quipe ADELE, Universit\xE9 Joseph Fourier
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+
+II. Used Software
+
+This product uses software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+
+III. License Summary
+- Apache License 2.0
Deleted: trunk/felix/config.properties
===================================================================
--- trunk/runtime/config.properties 2009-03-04 16:34:43 UTC (rev 44)
+++ trunk/felix/config.properties 2009-04-08 15:58:11 UTC (rev 46)
@@ -1,41 +0,0 @@
-# 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.
-
-# The log level for iPOJO
-ipojo.log.level=WARNING
-
-# Starts the bundles
-felix.auto.start.1= \
- file:bundle/org.apache.felix.shell-1.0.2.jar \
- file:bundle/org.apache.felix.shell.tui-1.0.2.jar \
- file:bundle/org.apache.felix.bundlerepository-1.2.1.jar \
- file:bundle/org.osgi.compendium-1.2.0.jar \
- file:bundle/org.apache.felix.eventadmin-1.0.0.jar \
- file:bundle/org.apache.felix.configadmin-1.0.10.jar \
- file:bundle/org.apache.felix.http.jetty-0.9.0.jar \
- file:bundle/org.apache.felix.webconsole-1.2.2.jar \
- file:bundle/org.apache.felix.ipojo-1.2.0.jar \
- file:bundle/org.apache.felix.ipojo.composite-1.2.0.jar \
- file:bundle/org.apache.felix.ipojo.arch-1.2.0.jar \
- file:bundle/org.apache.felix.ipojo.handler.eventadmin-1.2.0.jar \
- file:bundle/org.apache.felix.ipojo.handler.whiteboard-1.2.0.jar \
- file:bundle/org.apache.felix.ipojo.handler.temporal-1.2.0.jar \
- file:bundle/org.apache.felix.ipojo.handler.extender-1.2.0.jar \
- file:bundle/org.apache.felix.ipojo.handler.jmx-1.2.0.jar
-
-org.osgi.service.http.port=8080
-obr.repository.url=http://felix.apache.org/obr/releases.xml
\ No newline at end of file
Copied: trunk/felix/config.properties (from rev 45, trunk/runtime/config.properties)
===================================================================
--- trunk/felix/config.properties (rev 0)
+++ trunk/felix/config.properties 2009-04-08 15:58:11 UTC (rev 46)
@@ -0,0 +1,42 @@
+# 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.
+
+# The log level for iPOJO
+ipojo.log.level=WARNING
+
+# Starts the bundles
+felix.auto.start.1= \
+ file:bundle/org.apache.felix.shell-1.0.2.jar \
+ file:bundle/org.apache.felix.shell.tui-1.0.2.jar \
+ file:bundle/org.apache.felix.bundlerepository-1.2.1.jar \
+ file:bundle/org.osgi.compendium-1.2.0.jar \
+ file:bundle/org.apache.felix.log-1.0.0.jar \
+ file:bundle/org.apache.felix.eventadmin-1.0.0.jar \
+ file:bundle/org.apache.felix.configadmin-1.0.10.jar \
+ file:bundle/org.apache.felix.http.jetty-0.9.0.jar \
+ file:bundle/org.apache.felix.webconsole-1.2.2.jar \
+ file:bundle/org.apache.felix.ipojo-1.2.0.jar \
+ file:bundle/org.apache.felix.ipojo.composite-1.2.0.jar \
+ file:bundle/org.apache.felix.ipojo.arch-1.2.0.jar \
+ file:bundle/org.apache.felix.ipojo.handler.eventadmin-1.2.0.jar \
+ file:bundle/org.apache.felix.ipojo.handler.whiteboard-1.2.0.jar \
+ file:bundle/org.apache.felix.ipojo.handler.temporal-1.2.0.jar \
+ file:bundle/org.apache.felix.ipojo.handler.extender-1.2.0.jar \
+ file:bundle/org.apache.felix.ipojo.handler.jmx-1.2.0.jar
+
+org.osgi.service.http.port=8080
+obr.repository.url=http://felix.apache.org/obr/releases.xml
\ No newline at end of file
Deleted: trunk/felix/pom.xml
===================================================================
--- trunk/runtime/pom.xml 2009-03-04 16:34:43 UTC (rev 44)
+++ trunk/felix/pom.xml 2009-04-08 15:58:11 UTC (rev 46)
@@ -1,293 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <!-- Project coordinates -->
- <groupId>net.sourceforge.ipojo-toolbox</groupId>
- <artifactId>runtime</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <!-- Project's informations -->
- <name>iPOJO-Toolbox - iPOJO runtime environment</name>
- <description>Collection of Apache Felix and iPOJO bundles, grouped in a single archive, that provides a base environment to run and manage iPOJO components.</description>
- <url>http://ipojo-toolbox.wiki.sourceforge.net/iPOJO-runtime</url>
- <inceptionYear>2009</inceptionYear>
-
- <!-- Organization informations -->
- <organization>
- <name>Équipe ADELE, Université Joseph Fourier</name>
- <url>http://www-adele.imag.fr/</url>
- </organization>
-
- <!-- Developers informations -->
- <developers>
- <developer>
- <id>bourretp</id>
- <name>Pierre Bourret</name>
- <organization>Équipe ADELE, Université Joseph Fourier</organization>
- <organizationUrl>http://www-adele.imag.fr/</organizationUrl>
- <roles>
- <role>architect</role>
- <role>developer</role>
- </roles>
- <timezone>+1</timezone>
- </developer>
- </developers>
-
-
- <!-- License informations -->
- <licenses>
- <license>
- <name>Apache License - Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>manual</distribution>
- <comments />
- </license>
- </licenses>
-
- <!-- Software configuration management -->
- <scm>
- <connection>scm:svn:https://ipojo-toolbox.svn.sourceforge.net/svnroot/ipojo-toolbox/trunk/runtime/</connection>
- <url>http://ipojo-toolbox.svn.sourceforge.net/viewvc/ipojo-toolbox/trunk/runtime/</url>
- </scm>
-
- <!-- Issue tracking -->
- <issueManagement>
- <system>SourceForge.net Tracker</system>
- <url>http://sourceforge.net/tracker/?group_id=253916</url>
- </issueManagement>
-
- <!-- Mailing lists -->
- <mailingLists>
- <mailingList>
- <name>ipojo-toolbox-users</name>
- <post>ipo...@li...</post>
- <subscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-users</subscribe>
- <unsubscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-users</unsubscribe>
- <archive>https://sourceforge.net/mailarchive/forum.php?forum_name=ipojo-toolbox-users</archive>
- </mailingList>
- <mailingList>
- <name>ipojo-toolbox-commits</name>
- <post>ipo...@li...</post>
- <subscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-commits</subscribe>
- <unsubscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-commits</unsubscribe>
- <archive>https://sourceforge.net/mailarchive/forum.php?forum_name=ipojo-toolbox-commits</archive>
- </mailingList>
- </mailingLists>
-
- <!-- Distribution management -->
- <distributionManagement>
- <repository>
- <id>ipojo-toolbox-m2-repo</id>
- <name>iPOJO-Toolbox repository</name>
- <url>sftp://web.sourceforge.net/home/groups/i/ip/ipojo-toolbox/htdocs/m2-repo</url>
- <uniqueVersion>false</uniqueVersion>
- </repository>
- <snapshotRepository>
- <id>ipojo-toolbox-m2-snapshot-repo</id>
- <name>iPOJO-Toolbox snapshots repository</name>
- <url>sftp://web.sourceforge.net/home/groups/i/ip/ipojo-toolbox/htdocs/m2-snapshot-repo</url>
- <uniqueVersion>true</uniqueVersion>
- </snapshotRepository>
- </distributionManagement>
-
- <!-- Project dependencies -->
- <dependencies>
-
- <!-- Felix core bundles -->
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.main</artifactId>
- <version>1.4.1</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.shell</artifactId>
- <version>1.0.2</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.shell.tui</artifactId>
- <version>1.0.2</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.bundlerepository</artifactId>
- <version>1.2.1</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>1.2.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.eventadmin</artifactId>
- <version>1.0.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.0.10</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <!-- As the Felix Jetty HTTP Service has never been released, we embeds a fake-released version of this bundle. -->
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.jetty</artifactId>
- <version>0.9.0</version>
- <scope>system</scope>
- <systemPath>${project.basedir}/lib/org.apache.felix.http.jetty-0.9.0.jar</systemPath>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.webconsole</artifactId>
- <version>1.2.2</version>
- <scope>runtime</scope>
- </dependency>
-
- <!-- iPOJO bundles -->
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo</artifactId>
- <version>1.2.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.composite</artifactId>
- <version>1.2.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.arch</artifactId>
- <version>1.2.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.handler.eventadmin</artifactId>
- <version>1.2.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.handler.whiteboard</artifactId>
- <version>1.2.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.handler.temporal</artifactId>
- <version>1.2.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.handler.extender</artifactId>
- <version>1.2.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.handler.jmx</artifactId>
- <version>1.2.0</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
-
- <!-- Project properties -->
- <properties>
- <!-- The target directory containing all dependency bundles. -->
- <bundle.target.dir>bundle</bundle.target.dir>
- </properties>
-
- <!-- Build configuration -->
- <build>
- <plugins>
-
- <!-- Collects project dependencies into the target bundle directory -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-bundles</id>
- <phase>package</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <outputDirectory>${bundle.target.dir}</outputDirectory>
- <excludeTransitive>true</excludeTransitive>
- <overWriteSnapshots>true</overWriteSnapshots>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <!-- Archive the generated runtime -->
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>install</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <finalName>iPOJO-runtime-${project.version}</finalName>
- <tarLongFileMode>gnu</tarLongFileMode>
- <descriptors>
- <descriptor>assembly.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
-
- <!-- Removes the target bundle directory -->
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${project.basedir}</directory>
- <includes>
- <include>${bundle.target.dir}</include>
- </includes>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-</project>
\ No newline at end of file
Copied: trunk/felix/pom.xml (from rev 45, trunk/runtime/pom.xml)
===================================================================
--- trunk/felix/pom.xml (rev 0)
+++ trunk/felix/pom.xml 2009-04-08 15:58:11 UTC (rev 46)
@@ -0,0 +1,299 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <!-- Project coordinates -->
+ <groupId>net.sourceforge.ipojo-toolbox</groupId>
+ <artifactId>runtime</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <!-- Project's informations -->
+ <name>iPOJO-Toolbox - iPOJO runtime environment</name>
+ <description>Collection of Apache Felix and iPOJO bundles, grouped in a single archive, that provides a base environment to run and manage iPOJO components.</description>
+ <url>http://ipojo-toolbox.wiki.sourceforge.net/iPOJO-runtime</url>
+ <inceptionYear>2009</inceptionYear>
+
+ <!-- Organization informations -->
+ <organization>
+ <name>Équipe ADELE, Université Joseph Fourier</name>
+ <url>http://www-adele.imag.fr/</url>
+ </organization>
+
+ <!-- Developers informations -->
+ <developers>
+ <developer>
+ <id>bourretp</id>
+ <name>Pierre Bourret</name>
+ <organization>Équipe ADELE, Université Joseph Fourier</organization>
+ <organizationUrl>http://www-adele.imag.fr/</organizationUrl>
+ <roles>
+ <role>architect</role>
+ <role>developer</role>
+ </roles>
+ <timezone>+1</timezone>
+ </developer>
+ </developers>
+
+
+ <!-- License informations -->
+ <licenses>
+ <license>
+ <name>Apache License - Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>manual</distribution>
+ <comments />
+ </license>
+ </licenses>
+
+ <!-- Software configuration management -->
+ <scm>
+ <connection>scm:svn:https://ipojo-toolbox.svn.sourceforge.net/svnroot/ipojo-toolbox/trunk/runtime/</connection>
+ <url>http://ipojo-toolbox.svn.sourceforge.net/viewvc/ipojo-toolbox/trunk/runtime/</url>
+ </scm>
+
+ <!-- Issue tracking -->
+ <issueManagement>
+ <system>SourceForge.net Tracker</system>
+ <url>http://sourceforge.net/tracker/?group_id=253916</url>
+ </issueManagement>
+
+ <!-- Mailing lists -->
+ <mailingLists>
+ <mailingList>
+ <name>ipojo-toolbox-users</name>
+ <post>ipo...@li...</post>
+ <subscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-users</subscribe>
+ <unsubscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-users</unsubscribe>
+ <archive>https://sourceforge.net/mailarchive/forum.php?forum_name=ipojo-toolbox-users</archive>
+ </mailingList>
+ <mailingList>
+ <name>ipojo-toolbox-commits</name>
+ <post>ipo...@li...</post>
+ <subscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-commits</subscribe>
+ <unsubscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-commits</unsubscribe>
+ <archive>https://sourceforge.net/mailarchive/forum.php?forum_name=ipojo-toolbox-commits</archive>
+ </mailingList>
+ </mailingLists>
+
+ <!-- Distribution management -->
+ <distributionManagement>
+ <repository>
+ <id>ipojo-toolbox-m2-repo</id>
+ <name>iPOJO-Toolbox repository</name>
+ <url>sftp://web.sourceforge.net/home/groups/i/ip/ipojo-toolbox/htdocs/m2-repo</url>
+ <uniqueVersion>false</uniqueVersion>
+ </repository>
+ <snapshotRepository>
+ <id>ipojo-toolbox-m2-snapshot-repo</id>
+ <name>iPOJO-Toolbox snapshots repository</name>
+ <url>sftp://web.sourceforge.net/home/groups/i/ip/ipojo-toolbox/htdocs/m2-snapshot-repo</url>
+ <uniqueVersion>true</uniqueVersion>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <!-- Project dependencies -->
+ <dependencies>
+
+ <!-- Felix core bundles -->
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.main</artifactId>
+ <version>1.4.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.shell</artifactId>
+ <version>1.0.2</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.shell.tui</artifactId>
+ <version>1.0.2</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.bundlerepository</artifactId>
+ <version>1.2.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>1.2.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.log</artifactId>
+ <version>1.0.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.eventadmin</artifactId>
+ <version>1.0.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <version>1.0.10</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <!-- As the Felix Jetty HTTP Service has never been released, we embeds a fake-released version of this bundle. -->
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.jetty</artifactId>
+ <version>0.9.0</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/lib/org.apache.felix.http.jetty-0.9.0.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.webconsole</artifactId>
+ <version>1.2.2</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!-- iPOJO bundles -->
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo</artifactId>
+ <version>1.2.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo.composite</artifactId>
+ <version>1.2.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo.arch</artifactId>
+ <version>1.2.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo.handler.eventadmin</artifactId>
+ <version>1.2.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo.handler.whiteboard</artifactId>
+ <version>1.2.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo.handler.temporal</artifactId>
+ <version>1.2.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo.handler.extender</artifactId>
+ <version>1.2.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo.handler.jmx</artifactId>
+ <version>1.2.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+
+ <!-- Project properties -->
+ <properties>
+ <!-- The target directory containing all dependency bundles. -->
+ <bundle.target.dir>bundle</bundle.target.dir>
+ </properties>
+
+ <!-- Build configuration -->
+ <build>
+ <plugins>
+
+ <!-- Collects project dependencies into the target bundle directory -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-bundles</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${bundle.target.dir}</outputDirectory>
+ <excludeTransitive>true</excludeTransitive>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- Archive the generated runtime -->
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>install</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <finalName>iPOJO-runtime-${project.version}</finalName>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ <descriptors>
+ <descriptor>assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+
+ <!-- Removes the target bundle directory -->
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${project.basedir}</directory>
+ <includes>
+ <include>${bundle.target.dir}</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+</project>
Added: trunk/utils/arch-equinox/LICENSE
===================================================================
--- trunk/utils/arch-equinox/LICENSE (rev 0)
+++ trunk/utils/arch-equinox/LICENSE 2009-04-08 15:58:11 UTC (rev 46)
@@ -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: trunk/utils/arch-equinox/NOTICE
===================================================================
--- trunk/utils/arch-equinox/NOTICE (rev 0)
+++ trunk/utils/arch-equinox/NOTICE 2009-04-08 15:58:11 UTC (rev 46)
@@ -0,0 +1,17 @@
+Apache Felix iPOJO Arch Command for Equinox
+Copyright 2008 The Apache Software Foundation
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+II. Used Software
+
+This product uses software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+III. License Summary
+- Apache License 2.0
Added: trunk/utils/arch-equinox/doc/architecture-handler.html
===================================================================
--- trunk/utils/arch-equinox/doc/architecture-handler.html (rev 0)
+++ trunk/utils/arch-equinox/doc/architecture-handler.html 2009-04-08 15:58:11 UTC (rev 46)
@@ -0,0 +1,135 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<HTML>
+
+
+<HEAD>
+ <TITLE>Apache Felix - Architecture Handler</TITLE>
+ <LINK rel="stylesheet" href="http://felix.apache.org/site/media.data/site.css" type="text/css" media="all">
+ <META http-equiv="Content-Type" content="text/html;charset=UTF-8">
+ </HEAD>
+ <BODY>
+ <DIV class="title"><DIV class="logo"><A href="http://felix.apache.org/site/index.html"><IMG border="0" alt="Apache Felix" src="http://felix.apache.org/site/media.data/logo.png"></A></DIV><DIV class="header"><A href="http://www.apache.org/"><IMG border="0" alt="Apache" src="http://felix.apache.org/site/media.data/apache.png"></A></DIV></DIV>
+ <DIV class="menu">
+
+
+
+
+
+ <UL>
+ <LI><A href="http://felix.apache.org/site/news.html" title="news">news</A></LI>
+ <LI><A href="http://felix.apache.org/site/license.html" title="license">license</A></LI>
+ <LI><SPAN class="nobr"><A href="http://felix.apache.org/site/downloads.cgi" title="Visit page outside Confluence" rel="nofollow">downloads<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></LI>
+ <LI><A href="http://felix.apache.org/site/documentation.html" title="documentation">documentation</A></LI>
+ <LI><A href="http://felix.apache.org/site/mailinglists.html" title="mailinglists">mailing lists</A></LI>
+ <LI><A href="http://felix.apache.org/site/contributing.html" title="Contributing">contributing</A></LI>
+ <LI><SPAN class="nobr"><A href="http://www.apache.org/" title="Visit page outside Confluence" rel="nofollow">asf<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></LI>
+ <LI><SPAN class="nobr"><A href="http://www.apache.org/foundation/sponsorship.html" title="Visit page outside Confluence" rel="nofollow">sponsorship<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></LI>
+ <LI><SPAN class="nobr"><A href="http://www.apache.org/foundation/thanks.html" title="Visit page outside Confluence" rel="nofollow">sponsors<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>
+<!-- ApacheCon Ad -->
+<IFRAME src="http://www.apache.org/ads/button.html" style="border-width:0; float: left" frameborder="0" scrolling="no" width="135" height="135"></IFRAME>
+<P style="height: 100px">
+<!-- ApacheCon Ad --></LI>
+</UL>
+ </DIV>
+ <DIV class="main">
+<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="80%">
+<H1><A name="ArchitectureHandler-IntrospectionandArchitecture"></A>Introspection and Architecture</H1>
+
+<P>The architecture feature allows obtaining an architectural / component view of your systems. It exposes a snapshot of the present instances & factories, the state of these instances ...<BR>
+Moreover; iPOJO defines an 'arch' command displaying this architecture in Felix. You need to install the arch command bundle available in the Felix trunk.</P>
+
+<H2><A name="ArchitectureHandler-Reflectiononthecomponent"></A>Reflection on the component</H2>
+
+<P>The architecture feature does "reflection" on the iPOJO containers. It gathers information about the component (state, class name ...), requirement (state, multiple, optional ...), provided services (state, properties) ... Each handler can participate to the architecture. This information allows you to know why an instance does not start, or why the component does not publish / provide a service.</P>
+
+<H2><A name="ArchitectureHandler-Metadata"></A>Metadata</H2>
+
+<P>The architecture (i.e. instance introspection) is activated by default. To disable it, you need to add an attribute <EM>"architecture=false"</EM> to the component element:</P>
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-xml"><SPAN class="code-tag"><Component className=<SPAN class="code-quote">"fr.imag.adele.escoffier.hello.impl.HelloServiceImpl"</SPAN> architecture=<SPAN class="code-quote">"false"</SPAN>></SPAN></PRE>
+</DIV></DIV>
+<P>By default, the architecture feature is enabled.</P>
+
+<H2><A name="ArchitectureHandler-The%22arch%22command"></A>The "arch" command</H2>
+
+<P>A Felix command comes with the architecture handler. This command looks for all component exposing the architecture and print the information.</P>
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">arch => displays instances name & state (equivalent to arch \-instances)
+arch -instance $instance_name => displays complete information about the instance $instance_name
+arch -factories => display the list of available factories
+arch -factory $factory_name => display complete information about the factory $factory_name</PRE>
+</DIV></DIV>
+<H2><A name="ArchitectureHandler-Technicalinformation"></A>Technical information</H2>
+
+<P>In fact, when a component enables the architecture introspection, its container exposes an Architecture service. Any architecture requester can obtain information about the instance. For example, the arch command requests all the architecture services and prints the information.</P>
+</TD>
+<TD class="confluenceTd" valign="top" width="20%">
+<FORM method="get" class="confluence-searchbox marginlessForm " action="http://felix.apache.org/confluence/dosearchsite.action">
+ <INPUT type="hidden" name="searchQuery.spaceKey" value="FELIX">
+ <INPUT type="text" name="searchQuery.queryString">
+ <INPUT type="submit" value="Search">
+</FORM>
+<HR>
+<H6><A name="ArchitectureHandler-Overview"></A><B>Overview</B></H6>
+<UL>
+ <LI><A href="http://felix.apache.org/site/apache-felix-ipojo.html" title="Apache Felix iPOJO">Home Page</A></LI>
+ <LI><A href="http://felix.apache.org/site/apache-felix-ipojo-feature-overview.html" title="Apache Felix iPOJO Feature Overview">iPOJO Feature Overview</A></LI>
+ <LI><A href="http://felix.apache.org/site/download.html" title="Download">Download & Install </A></LI>
+</UL>
+
+
+<H6><A name="ArchitectureHandler-GettingStarted"></A><B>Getting Started</B></H6>
+<UL>
+ <LI><A href="http://felix.apache.org/site/ipojo-in-10-minutes.html" title="iPOJO in 10 minutes">iPOJO in 10 minutes</A></LI>
+ <LI><A href="http://felix.apache.org/site/ipojo-hello-word-maven-based-tutorial.html" title="iPOJO Hello Word (Maven-Based) tutorial">iPOJO Hello Word (Maven-Based) tutorial</A></LI>
+ <LI><A href="http://felix.apache.org/site/ipojo-advanced-tutorial.html" title="iPOJO Advanced Tutorial">iPOJO Advanced Tutorial</A></LI>
+</UL>
+
+
+<H6><A name="ArchitectureHandler-UserGuide"></A><B>User Guide</B></H6>
+<UL>
+ <LI><A href="http://felix.apache.org/site/describing-components.html" title="Describing components">Describing components</A></LI>
+ <LI><A href="http://felix.apache.org/site/how-to-use-ipojo-annotations.html" title="How to use iPOJO Annotations">How to use iPOJO Annotations</A></LI>
+ <LI><A href="http://felix.apache.org/site/ipojo-advanced-topics.html" title="iPOJO Advanced Topics">Advanced Topics</A></LI>
+ <LI><A href="http://felix.apache.org/site/ipojo-faq.html" title="iPOJO FAQ">FAQ</A></LI>
+</UL>
+
+
+<H6><A name="ArchitectureHandler-Tools"></A><B>Tools</B></H6>
+<UL>
+ <LI><A href="http://felix.apache.org/site/ipojo-eclipse-plug-in.html" title="iPOJO Eclipse Plug-in">iPOJO Eclipse Plug-in</A></LI>
+ <LI><A href="http://felix.apache.org/site/ipojo-ant-task.html" title="iPOJO Ant Task">iPOJO Ant Task</A></LI>
+ <LI><A href="http://felix.apache.org/site/ipojo-maven-plug-in.html" title="iPOJO Maven Plug-in">iPOJO Maven Plug-in</A></LI>
+ <LI><A href="http://felix.apache.org/site/ipojo-concepts-overview.html" title="iPOJO Concepts Overview">iPOJO concepts overview</A></LI>
+</UL>
+
+
+<H6><A name="ArchitectureHandler-DeveloperGuide"></A><B>Developer Guide</B></H6>
+<UL>
+ <LI><A href="http://felix.apache.org/site/how-to-write-your-own-handler.html" title="How to write your own handler">How to write your own handler</A></LI>
+ <LI><A href="http://felix.apache.org/site/how-to-use-ipojo-manipulation-metadata.html" title="How to use iPOJO Manipulation Metadata">How to use iPOJO Manipulation Metadata</A></LI>
+</UL>
+
+
+<H6><A name="ArchitectureHandler-Misc%26Contact"></A><B>Misc & Contact</B></H6>
+<UL>
+ <LI><A href="http://felix.apache.org/site/apache-felix-ipojo-issuestracker.html" title="apache-felix-ipojo-issuestracker">Issues Tracker</A></LI>
+ <LI><A href="http://felix.apache.org/site/apache-felix-ipojo-supportedvms.html" title="apache-felix-ipojo-supportedVMs">Supported JVMs</A></LI>
+ <LI><A href="http://felix.apache.org/site/apache-felix-ipojo-supportedosgi.html" title="apache-felix-ipojo-supportedOSGi">Supported OSGi Implementations</A></LI>
+ <LI><A href="http://felix.apache.org/site/future-ideas.html" title="Future Ideas">Future Ideas</A></LI>
+ <LI><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=FELIX&title=Contact&linkCreation=true&fromPageId=82824" title="Create Page: Contact" class="createlink">Contact<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></LI>
+ <LI><A href="http://felix.apache.org/site/related-works.html" title="Related Works">Related Works</A></LI>
+ <LI><A href="http://felix.apache.org/site/article-presentations.html" title="Article & Presentations">Article & Presentations</A></LI>
+</UL>
+
+
+<HR>
+<DIV class="" align="center">
+<P><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/createrssfeed.action?types=blogpost&statuses=created&statuses=modified&spaces=FELIX&labelString=iPOJO&rssType=atom&maxResults=10&timeSpan=5&publicFeed=true&title=iPOJO%20Atom%20Feed" title="Stay tuned!" rel="nofollow"><IMG src="http://cwiki.apache.org/confluence/images/icons/feed-icon-32x32.png" align="absmiddle" border="0"><SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P></DIV></TD></TR></TBODY></TABLE>
+ </DIV>
+ </BODY>
+
+
+</HTML>
Added: trunk/utils/arch-equinox/doc/changelog.txt
===================================================================
--- trunk/utils/arch-equinox/doc/changelog.txt (rev 0)
+++ trunk/utils/arch-equinox/doc/changelog.txt 2009-04-08 15:58:11 UTC (rev 46)
@@ -0,0 +1,3 @@
+Version 0.8.0
+-------------
+* [2008-05-16] Initial release
\ No newline at end of file
Added: trunk/utils/arch-equinox/doc/media.data/apache.png
===================================================================
(Binary files differ)
Property changes on: trunk/utils/arch-equinox/doc/media.data/apache.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/utils/arch-equinox/doc/media.data/gradient.png
===================================================================
(Binary files differ)
Property changes on: trunk/utils/arch-equinox/doc/media.data/gradient.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/utils/arch-equinox/doc/media.data/logo.png
===================================================================
(Binary files differ)
Property changes on: trunk/utils/arch-equinox/doc/media.data/logo.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/utils/arch-equinox/doc/media.data/site.css
===================================================================
--- trunk/utils/arch-equinox/doc/media.data/site.css (rev 0)
+++ trunk/utils/arch-equinox/doc/media.data/site.css 2009-04-08 15:58:11 UTC (rev 46)
@@ -0,0 +1,25 @@
+/* @override http://felix.apache.org/site/media.data/site.css */
+
+body { background-color: #ffffff; color: #3b3b3b; font-family: Tahoma, Arial, sans-serif; font-size: 10pt; line-height: 140% }
+h1, h2, h3, h4, h5, h6 { font-weight: normal; color: #000000; line-height: 100%; margin-top: 0px}
+h1 { font-size: 200% }
+h2 { font-size: 175% }
+h3 { font-size: 150% }
+h4 { font-size: 140% }
+h5 { font-size: 130% }
+h6 { font-size: 120% }
+a { color: #1980af }
+a:visited { color: #1980af }
+a:hover { color: #1faae9 }
+.title { position: absolute; left: 1px; right: 1px; top:25px; height: 81px; background: url(http://felix.apache.org/site/media.data/gradient.png) repeat-x; background-position: bottom; }
+.logo { position: absolute; width: 15em; height: 81px; text-align: center; }
+.header { text-align: right; margin-right: 20pt; margin-top: 30pt;}
+.menu { border-top: 10px solid #f9bb00; position: absolute; top: 107px; left: 1px; width: 15em; bottom: 0px; padding: 0px; background-color: #fcfcfc }
+.menu ul { background-color: #fdf5d9; list-style: none; padding-left: 4em; margin-top: 0px; padding-top: 2em; padding-bottom: 2em; margin-left: 0px; color: #4a4a43}
+.menu a { text-decoration: none; color: #4a4a43 }
+.main { position: absolute; border-top: 10px solid #cde0ea; top: 107px; left: 15em; right: 1px; margin-left: 2px; padding-right: 4em; padding-left: 1em; padding-top: 1em;}
+.code { background-color: #eeeeee; border: solid 1px black; padding: 0.5em }
+.code-keyword { color: #880000 }
+.code-quote { color: #008800 }
+.code-object { color: #0000dd }
+.code-java { margin: 0em }
\ No newline at end of file
Added: trunk/utils/arch-equinox/pom.xml
===================================================================
--- trunk/utils/arch-equinox/pom.xml (rev 0)
+++ trunk/utils/arch-equinox/pom.xml 2009-04-08 15:58:11 UTC (rev 46)
@@ -0,0 +1,102 @@
+<!--
+ 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://ma...
[truncated message content] |
|
From: <bou...@us...> - 2009-04-06 13:15:06
|
Revision: 45
http://ipojo-toolbox.svn.sourceforge.net/ipojo-toolbox/?rev=45&view=rev
Author: bourretp
Date: 2009-04-06 13:15:00 +0000 (Mon, 06 Apr 2009)
Log Message:
-----------
iPOJO-runtime :
+ Added the released Apache Felix Log service.
* Updated copyright information.
-----
TODO : Add the Apache Felix HTTP service (based on Jetty) when it becomes released.
Modified Paths:
--------------
trunk/runtime/NOTICE
trunk/runtime/config.properties
trunk/runtime/pom.xml
Modified: trunk/runtime/NOTICE
===================================================================
--- trunk/runtime/NOTICE 2009-03-04 16:34:43 UTC (rev 44)
+++ trunk/runtime/NOTICE 2009-04-06 13:15:00 UTC (rev 45)
@@ -1,5 +1,5 @@
iPOJO-Toolbox - iPOJO runtime environment
-Copyright 2009 Equipe ADELE, Universit\xE9 Joseph Fourier
+Copyright 2009 \xC9quipe ADELE, Universit\xE9 Joseph Fourier
I. Included Software
@@ -17,7 +17,7 @@
This product uses software developed at
The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2007).
+Copyright (c) OSGi Alliance (2000, 2009).
Licensed under the Apache License 2.0.
Modified: trunk/runtime/config.properties
===================================================================
--- trunk/runtime/config.properties 2009-03-04 16:34:43 UTC (rev 44)
+++ trunk/runtime/config.properties 2009-04-06 13:15:00 UTC (rev 45)
@@ -24,6 +24,7 @@
file:bundle/org.apache.felix.shell.tui-1.0.2.jar \
file:bundle/org.apache.felix.bundlerepository-1.2.1.jar \
file:bundle/org.osgi.compendium-1.2.0.jar \
+ file:bundle/org.apache.felix.log-1.0.0.jar \
file:bundle/org.apache.felix.eventadmin-1.0.0.jar \
file:bundle/org.apache.felix.configadmin-1.0.10.jar \
file:bundle/org.apache.felix.http.jetty-0.9.0.jar \
Modified: trunk/runtime/pom.xml
===================================================================
--- trunk/runtime/pom.xml 2009-03-04 16:34:43 UTC (rev 44)
+++ trunk/runtime/pom.xml 2009-04-06 13:15:00 UTC (rev 45)
@@ -146,6 +146,12 @@
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.log</artifactId>
+ <version>1.0.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.eventadmin</artifactId>
<version>1.0.0</version>
<scope>runtime</scope>
@@ -290,4 +296,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bou...@us...> - 2009-03-04 16:34:47
|
Revision: 44
http://ipojo-toolbox.svn.sourceforge.net/ipojo-toolbox/?rev=44&view=rev
Author: bourretp
Date: 2009-03-04 16:34:43 +0000 (Wed, 04 Mar 2009)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/runtime/pom.xml
Modified: trunk/runtime/pom.xml
===================================================================
--- trunk/runtime/pom.xml 2009-03-04 16:34:35 UTC (rev 43)
+++ trunk/runtime/pom.xml 2009-03-04 16:34:43 UTC (rev 44)
@@ -23,7 +23,7 @@
<!-- Project coordinates -->
<groupId>net.sourceforge.ipojo-toolbox</groupId>
<artifactId>runtime</artifactId>
- <version>1.2.0</version>
+ <version>1.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
<!-- Project's informations -->
@@ -66,8 +66,8 @@
<!-- Software configuration management -->
<scm>
- <connection>scm:svn:https://ipojo-toolbox.svn.sourceforge.net/svnroot/ipojo-toolbox/tags/runtime-1.2.0</connection>
- <url>http://ipojo-toolbox.svn.sourceforge.net/viewvc/ipojo-toolbox/tags/runtime-1.2.0</url>
+ <connection>scm:svn:https://ipojo-toolbox.svn.sourceforge.net/svnroot/ipojo-toolbox/trunk/runtime/</connection>
+ <url>http://ipojo-toolbox.svn.sourceforge.net/viewvc/ipojo-toolbox/trunk/runtime/</url>
</scm>
<!-- Issue tracking -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bou...@us...> - 2009-03-04 16:34:41
|
Revision: 43
http://ipojo-toolbox.svn.sourceforge.net/ipojo-toolbox/?rev=43&view=rev
Author: bourretp
Date: 2009-03-04 16:34:35 +0000 (Wed, 04 Mar 2009)
Log Message:
-----------
[maven-release-plugin] copy for tag runtime-1.2.0
Added Paths:
-----------
tags/runtime-1.2.0/
tags/runtime-1.2.0/NOTICE
tags/runtime-1.2.0/assembly.xml
tags/runtime-1.2.0/pom.xml
Removed Paths:
-------------
tags/runtime-1.2.0/NOTICE
tags/runtime-1.2.0/assembly.xml
tags/runtime-1.2.0/pom.xml
Deleted: tags/runtime-1.2.0/NOTICE
===================================================================
--- trunk/runtime/NOTICE 2009-03-03 16:03:57 UTC (rev 30)
+++ tags/runtime-1.2.0/NOTICE 2009-03-04 16:34:35 UTC (rev 43)
@@ -1,25 +0,0 @@
-iPOJO-Toolbox - iPOJO runtime environment
-Copyright 2009 ADELE Team, LIG
-
-
-I. Included Software
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-
-II. Used Software
-
-This product uses software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2007).
-Licensed under the Apache License 2.0.
-
-
-III. License Summary
-- Apache License 2.0
Copied: tags/runtime-1.2.0/NOTICE (from rev 38, trunk/runtime/NOTICE)
===================================================================
--- tags/runtime-1.2.0/NOTICE (rev 0)
+++ tags/runtime-1.2.0/NOTICE 2009-03-04 16:34:35 UTC (rev 43)
@@ -0,0 +1,25 @@
+iPOJO-Toolbox - iPOJO runtime environment
+Copyright 2009 Equipe ADELE, Universit\xE9 Joseph Fourier
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+
+II. Used Software
+
+This product uses software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2007).
+Licensed under the Apache License 2.0.
+
+
+III. License Summary
+- Apache License 2.0
Deleted: tags/runtime-1.2.0/assembly.xml
===================================================================
--- trunk/runtime/assembly.xml 2009-03-03 16:03:57 UTC (rev 30)
+++ tags/runtime-1.2.0/assembly.xml 2009-03-04 16:34:35 UTC (rev 43)
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<assembly>
- <formats>
- <format>tar.gz</format>
- <format>tar.bz2</format>
- <format>zip</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>.</directory>
- <outputDirectory>/</outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <excludes>
- <exclude>pom.xml</exclude>
- <exclude>assembly.xml</exclude>
- <exclude>lib/**</exclude>
- <exclude>target/**</exclude>
- <exclude>felix-cache/**</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-</assembly>
\ No newline at end of file
Copied: tags/runtime-1.2.0/assembly.xml (from rev 38, trunk/runtime/assembly.xml)
===================================================================
--- tags/runtime-1.2.0/assembly.xml (rev 0)
+++ tags/runtime-1.2.0/assembly.xml 2009-03-04 16:34:35 UTC (rev 43)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<assembly>
+ <formats>
+ <format>tar.gz</format>
+ <format>tar.bz2</format>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>.</directory>
+ <outputDirectory>/</outputDirectory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <excludes>
+ <exclude>pom.xml</exclude>
+ <exclude>assembly.xml</exclude>
+ <exclude>lib/**</exclude>
+ <exclude>target/**</exclude>
+ <exclude>felix-cache/**</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Deleted: tags/runtime-1.2.0/pom.xml
===================================================================
--- trunk/runtime/pom.xml 2009-03-03 16:03:57 UTC (rev 30)
+++ tags/runtime-1.2.0/pom.xml 2009-03-04 16:34:35 UTC (rev 43)
@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <!-- Project coordinates -->
- <groupId>net.sourceforge.ipojo-toolbox</groupId>
- <artifactId>runtime</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <!-- Project's informations -->
- <name>iPOJO-Toolbox - iPOJO runtime environment</name>
- <description>Collection of Apache Felix and iPOJO bundles, grouped in a single archive, that provides a base environment to run and manage iPOJO components.</description>
-
- <!-- License informations -->
- <licenses>
- <license>
- <name>Apache License - Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0</url>
- <distribution>manual</distribution>
- <comments></comments>
- </license>
- </licenses>
-
- <!-- Software configuration management -->
- <scm>
- <connection>scm:svn:https://ipojo-toolbox.svn.sourceforge.net/svnroot/ipojo-toolbox/trunk/runtime/</connection>
- <url>http://ipojo-toolbox.svn.sourceforge.net/viewvc/ipojo-toolbox/trunk/runtime/</url>
- </scm>
-
- <!-- Issue tracking -->
- <issueManagement>
- <system>SourceForge.net Tracker</system>
- <url>http://sourceforge.net/tracker/?group_id=253916</url>
- </issueManagement>
-
- <!-- Distribution management -->
- <distributionManagement>
- <repository>
- <id>ipojo-toolbox-m2-repo</id>
- <name>iPOJO-Toolbox repository</name>
- <url>scp://web.sourceforge.net/home/groups/i/ip/ipojo-toolbox/htdocs/m2-repo</url>
- <uniqueVersion>false</uniqueVersion>
- </repository>
- <snapshotRepository>
- <id>ipojo-toolbox-m2-snapshot-repo</id>
- <name>iPOJO-Toolbox snapshots repository</name>
- <url>scp://web.sourceforge.net/home/groups/i/ip/ipojo-toolbox/htdocs/m2-snapshot-repo</url>
- <uniqueVersion>true</uniqueVersion>
- </snapshotRepository>
- </distributionManagement>
-
- <!-- Project dependencies -->
- <dependencies>
-
- <!-- Felix core bundles -->
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.main</artifactId>
- <version>1.4.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.shell</artifactId>
- <version>1.0.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.shell.tui</artifactId>
- <version>1.0.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.bundlerepository</artifactId>
- <version>1.2.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>1.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.eventadmin</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.0.10</version>
- </dependency>
- <dependency>
- <!-- As the Felix Jetty HTTP Service has never been released, we embeds a fake-released version of this bundle. -->
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.jetty</artifactId>
- <version>0.9.0</version>
- <scope>system</scope>
- <systemPath>${project.basedir}/lib/org.apache.felix.http.jetty-0.9.0.jar</systemPath>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.webconsole</artifactId>
- <version>1.2.2</version>
- </dependency>
-
- <!-- iPOJO bundles -->
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo</artifactId>
- <version>1.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.composite</artifactId>
- <version>1.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.arch</artifactId>
- <version>1.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.handler.eventadmin</artifactId>
- <version>1.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.handler.whiteboard</artifactId>
- <version>1.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.handler.temporal</artifactId>
- <version>1.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.handler.extender</artifactId>
- <version>1.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.handler.jmx</artifactId>
- <version>1.2.0</version>
- </dependency>
- </dependencies>
-
- <!-- Project properties -->
- <properties>
- <!-- The target directory containing all dependency bundles. -->
- <bundle.target.dir>bundle</bundle.target.dir>
- </properties>
-
- <!-- Build configuration -->
- <build>
- <plugins>
-
- <!-- Collects project dependencies into the target bundle directory -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-bundles</id>
- <phase>package</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <outputDirectory>${bundle.target.dir}</outputDirectory>
- <excludeTransitive>true</excludeTransitive>
- <overWriteSnapshots>true</overWriteSnapshots>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <!-- Archive the generated runtime -->
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>install</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <finalName>iPOJO-runtime-${project.version}</finalName>
- <tarLongFileMode>gnu</tarLongFileMode>
- <descriptors>
- <descriptor>assembly.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
-
- <!-- Removes the target bundle directory -->
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${project.basedir}</directory>
- <includes>
- <include>${bundle.target.dir}</include>
- </includes>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-</project>
\ No newline at end of file
Copied: tags/runtime-1.2.0/pom.xml (from rev 42, trunk/runtime/pom.xml)
===================================================================
--- tags/runtime-1.2.0/pom.xml (rev 0)
+++ tags/runtime-1.2.0/pom.xml 2009-03-04 16:34:35 UTC (rev 43)
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <!-- Project coordinates -->
+ <groupId>net.sourceforge.ipojo-toolbox</groupId>
+ <artifactId>runtime</artifactId>
+ <version>1.2.0</version>
+ <packaging>pom</packaging>
+
+ <!-- Project's informations -->
+ <name>iPOJO-Toolbox - iPOJO runtime environment</name>
+ <description>Collection of Apache Felix and iPOJO bundles, grouped in a single archive, that provides a base environment to run and manage iPOJO components.</description>
+ <url>http://ipojo-toolbox.wiki.sourceforge.net/iPOJO-runtime</url>
+ <inceptionYear>2009</inceptionYear>
+
+ <!-- Organization informations -->
+ <organization>
+ <name>Équipe ADELE, Université Joseph Fourier</name>
+ <url>http://www-adele.imag.fr/</url>
+ </organization>
+
+ <!-- Developers informations -->
+ <developers>
+ <developer>
+ <id>bourretp</id>
+ <name>Pierre Bourret</name>
+ <organization>Équipe ADELE, Université Joseph Fourier</organization>
+ <organizationUrl>http://www-adele.imag.fr/</organizationUrl>
+ <roles>
+ <role>architect</role>
+ <role>developer</role>
+ </roles>
+ <timezone>+1</timezone>
+ </developer>
+ </developers>
+
+
+ <!-- License informations -->
+ <licenses>
+ <license>
+ <name>Apache License - Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>manual</distribution>
+ <comments />
+ </license>
+ </licenses>
+
+ <!-- Software configuration management -->
+ <scm>
+ <connection>scm:svn:https://ipojo-toolbox.svn.sourceforge.net/svnroot/ipojo-toolbox/tags/runtime-1.2.0</connection>
+ <url>http://ipojo-toolbox.svn.sourceforge.net/viewvc/ipojo-toolbox/tags/runtime-1.2.0</url>
+ </scm>
+
+ <!-- Issue tracking -->
+ <issueManagement>
+ <system>SourceForge.net Tracker</system>
+ <url>http://sourceforge.net/tracker/?group_id=253916</url>
+ </issueManagement>
+
+ <!-- Mailing lists -->
+ <mailingLists>
+ <mailingList>
+ <name>ipojo-toolbox-users</name>
+ <post>ipo...@li...</post>
+ <subscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-users</subscribe>
+ <unsubscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-users</unsubscribe>
+ <archive>https://sourceforge.net/mailarchive/forum.php?forum_name=ipojo-toolbox-users</archive>
+ </mailingList>
+ <mailingList>
+ <name>ipojo-toolbox-commits</name>
+ <post>ipo...@li...</post>
+ <subscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-commits</subscribe>
+ <unsubscribe>https://lists.sourceforge.net/lists/listinfo/ipojo-toolbox-commits</unsubscribe>
+ <archive>https://sourceforge.net/mailarchive/forum.php?forum_name=ipojo-toolbox-commits</archive>
+ </mailingList>
+ </mailingLists>
+
+ <!-- Distribution management -->
+ <distributionManagement>
+ <repository>
+ <id>ipojo-toolbox-m2-repo</id>
+ <name>iPOJO-Toolbox repository</name>
+ <url>sftp://web.sourceforge.net/home/groups/i/ip/ipojo-toolbox/htdocs/m2-repo</url>
+ <uniqueVersion>false</uniqueVersion>
+ </repository>
+ <snapshotRepository>
+ <id>ipojo-toolbox-m2-snapshot-repo</id>
+ <name>iPOJO-Toolbox snapshots repository</name>
+ <url>sftp://web.sourceforge.net/home/groups/i/ip/ipojo-toolbox/htdocs/m2-snapshot-repo</url>
+ <uniqueVersion>true</uniqueVersion>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <!-- Project dependencies -->
+ <dependencies>
+
+ <!-- Felix core bundles -->
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.main</artifactId>
+ <version>1.4.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.shell</artifactId>
+ <version>1.0.2</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.shell.tui</artifactId>
+ <version>1.0.2</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.bundlerepository</artifactId>
+ <version>1.2.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>1.2.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.eventadmin</artifactId>
+ <version>1.0.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <version>1.0.10</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <!-- As the Felix Jetty HTTP Service has never been released, we embeds a fake-released version of this bundle. -->
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.jetty</artifactId>
+ <version>0.9.0</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/lib/org.apache.felix.http.jetty-0.9.0.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.webconsole</artifactId>
+ <version>1.2.2</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!-- iPOJO bundles -->
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo</artifactId>
+ <version>1.2.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo.composite</artifactId>
+ <version>1.2.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo.arch</artifactId>
+ <version>1.2.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo.handler.eventadmin</artifactId>
+ <version>1.2.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo.handler.whiteboard</artifactId>
+ <version>1.2.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo.handler.temporal</artifactId>
+ <version>1.2.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo.handler.extender</artifactId>
+ <version>1.2.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo.handler.jmx</artifactId>
+ <version>1.2.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+
+ <!-- Project properties -->
+ <properties>
+ <!-- The target directory containing all dependency bundles. -->
+ <bundle.target.dir>bundle</bundle.target.dir>
+ </properties>
+
+ <!-- Build configuration -->
+ <build>
+ <plugins>
+
+ <!-- Collects project dependencies into the target bundle directory -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-bundles</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${bundle.target.dir}</outputDirectory>
+ <excludeTransitive>true</excludeTransitive>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- Archive the generated runtime -->
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>install</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <finalName>iPOJO-runtime-${project.version}</finalName>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ <descriptors>
+ <descriptor>assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+
+ <!-- Removes the target bundle directory -->
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${project.basedir}</directory>
+ <includes>
+ <include>${bundle.target.dir}</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|