[Ipojo-toolbox-commits] SF.net SVN: ipojo-toolbox:[67] trunk
Brought to you by:
bourretp
Menu
▾
▴
[Ipojo-toolbox-commits] SF.net SVN: ipojo-toolbox:[67] trunk
|
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.
|
