felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clem...@apache.org
Subject svn commit: r642265 [8/11] - in /felix/trunk/ipojo: ./ annotations/ ant/ ant/src/main/java/org/apache/felix/ipojo/task/ arch/ arch/src/main/java/org/apache/felix/ipojo/arch/ arch/src/main/resources/ composite/ composite/src/ composite/src/main/ composi...
Date Fri, 28 Mar 2008 15:35:29 GMT
Copied: felix/trunk/ipojo/examples/junit4osgi/junit4osgi/src/main/java/org/apache/felix/ipojo/junit4osgi/OSGiJunitRunner.java (from r640936, felix/sandbox/clement/ipojo/examples/junit4osgi/junit4osgi/src/main/java/org/apache/felix/ipojo/junit4osgi/OSGiJunitRunner.java)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/junit4osgi/junit4osgi/src/main/java/org/apache/felix/ipojo/junit4osgi/OSGiJunitRunner.java?p2=felix/trunk/ipojo/examples/junit4osgi/junit4osgi/src/main/java/org/apache/felix/ipojo/junit4osgi/OSGiJunitRunner.java&p1=felix/sandbox/clement/ipojo/examples/junit4osgi/junit4osgi/src/main/java/org/apache/felix/ipojo/junit4osgi/OSGiJunitRunner.java&r1=640936&r2=642265&rev=642265&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/examples/junit4osgi/junit4osgi/src/main/java/org/apache/felix/ipojo/junit4osgi/OSGiJunitRunner.java (original)
+++ felix/trunk/ipojo/examples/junit4osgi/junit4osgi/src/main/java/org/apache/felix/ipojo/junit4osgi/OSGiJunitRunner.java Fri Mar 28 08:33:36 2008
@@ -26,7 +26,6 @@
 
 /**
  * OSGi Junit Runner.
- * 
  * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */
 public interface OSGiJunitRunner {

Copied: felix/trunk/ipojo/examples/junit4osgi/junit4osgi/src/main/java/org/apache/felix/ipojo/junit4osgi/OSGiTestCase.java (from r640936, felix/sandbox/clement/ipojo/examples/junit4osgi/junit4osgi/src/main/java/org/apache/felix/ipojo/junit4osgi/OSGiTestCase.java)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/junit4osgi/junit4osgi/src/main/java/org/apache/felix/ipojo/junit4osgi/OSGiTestCase.java?p2=felix/trunk/ipojo/examples/junit4osgi/junit4osgi/src/main/java/org/apache/felix/ipojo/junit4osgi/OSGiTestCase.java&p1=felix/sandbox/clement/ipojo/examples/junit4osgi/junit4osgi/src/main/java/org/apache/felix/ipojo/junit4osgi/OSGiTestCase.java&r1=640936&r2=642265&rev=642265&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/examples/junit4osgi/junit4osgi/src/main/java/org/apache/felix/ipojo/junit4osgi/OSGiTestCase.java (original)
+++ felix/trunk/ipojo/examples/junit4osgi/junit4osgi/src/main/java/org/apache/felix/ipojo/junit4osgi/OSGiTestCase.java Fri Mar 28 08:33:36 2008
@@ -23,29 +23,26 @@
 import org.osgi.framework.BundleContext;
 
 /**
- * OSGi Test Case.
- * Allow the injection of the bundle context.
- * 
+ * OSGi Test Case. Allow the injection of the bundle context.
  * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */
 public class OSGiTestCase extends TestCase {
-    
+
     protected BundleContext context;
-    
+
     public void setBundleContext(BundleContext bc) {
         context = bc;
     }
-    
+
     /**
-     * Asserts that two doubles are equal.  If they are not
-     * an AssertionFailedError is thrown with the given message. 
+     * Asserts that two doubles are equal. If they are not an AssertionFailedError is thrown with the given message.
      */
     static public void assertEquals(String message, double expected, double actual) {
         if (Double.compare(expected, actual) != 0) {
             fail(formatEqualsMessage(message, expected, actual));
         }
     }
-    
+
     static String formatEqualsMessage(String message, Object expected, Object actual) {
         String formatted = "";
         if (message != null) {
@@ -53,7 +50,7 @@
         }
         return formatted + "expected:<" + expected + "> but was:<" + actual + ">";
     }
-    
+
     static String formatNotEqualsMessage(String message, Object o1, Object o2) {
         String formatted = "";
         if (message != null) {
@@ -61,13 +58,13 @@
         }
         return formatted + "o1:<" + o1 + "> is equals to o2:<" + o2 + ">";
     }
-    
+
     static String formatContainsMessage(String message, Object[] array, Object txt) {
         String formatted = "";
         if (message != null) {
             formatted = message + " ";
         }
-        
+
         String arr = null;
         for (int i = 0; i < array.length; i++) {
             if (arr == null) {
@@ -77,26 +74,30 @@
             }
         }
         arr += "]";
-        
+
         return formatted + "array:" + arr + " does not contains:<" + txt + ">";
     }
-    
+
     static public void assertNotEquals(String message, Object o1, Object o2) {
         if (o1.equals(o2)) {
             fail(formatNotEqualsMessage(message, o1, o2));
         }
     }
-    
+
     static public void assertContains(String message, String[] array, String txt) {
         for (int i = 0; i < array.length; i++) {
-            if (array[i].equals(txt)) { return; }
+            if (array[i].equals(txt)) {
+                return;
+            }
         }
         fail(formatContainsMessage(message, array, txt));
     }
-    
+
     static public void assertContains(String message, byte[] array, int txt) {
         for (int i = 0; i < array.length; i++) {
-            if (array[i] == txt) { return; }
+            if (array[i] == txt) {
+                return;
+            }
         }
         Byte[] bytes = new Byte[array.length];
         for (int i = 0; i < array.length; i++) {
@@ -104,10 +105,12 @@
         }
         fail(formatContainsMessage(message, bytes, txt));
     }
-    
+
     static public void assertContains(String message, short[] array, int txt) {
         for (int i = 0; i < array.length; i++) {
-            if (array[i] == txt) { return; }
+            if (array[i] == txt) {
+                return;
+            }
         }
         Short[] bytes = new Short[array.length];
         for (int i = 0; i < array.length; i++) {
@@ -115,10 +118,12 @@
         }
         fail(formatContainsMessage(message, bytes, txt));
     }
-    
+
     static public void assertContains(String message, int[] array, int txt) {
         for (int i = 0; i < array.length; i++) {
-            if (array[i] == txt) { return; }
+            if (array[i] == txt) {
+                return;
+            }
         }
         Integer[] bytes = new Integer[array.length];
         for (int i = 0; i < array.length; i++) {
@@ -126,10 +131,12 @@
         }
         fail(formatContainsMessage(message, bytes, txt));
     }
-    
+
     static public void assertContains(String message, long[] array, long txt) {
         for (int i = 0; i < array.length; i++) {
-            if (array[i] == txt) { return; }
+            if (array[i] == txt) {
+                return;
+            }
         }
         Long[] bytes = new Long[array.length];
         for (int i = 0; i < array.length; i++) {
@@ -137,10 +144,12 @@
         }
         fail(formatContainsMessage(message, bytes, txt));
     }
-    
+
     static public void assertContains(String message, float[] array, float txt) {
         for (int i = 0; i < array.length; i++) {
-            if (array[i] == txt) { return; }
+            if (array[i] == txt) {
+                return;
+            }
         }
         Float[] bytes = new Float[array.length];
         for (int i = 0; i < array.length; i++) {
@@ -148,10 +157,12 @@
         }
         fail(formatContainsMessage(message, bytes, txt));
     }
-    
+
     static public void assertContains(String message, double[] array, double txt) {
         for (int i = 0; i < array.length; i++) {
-            if (array[i] == txt) { return; }
+            if (array[i] == txt) {
+                return;
+            }
         }
         Double[] bytes = new Double[array.length];
         for (int i = 0; i < array.length; i++) {
@@ -159,10 +170,12 @@
         }
         fail(formatContainsMessage(message, bytes, txt));
     }
-    
+
     static public void assertContains(String message, char[] array, char txt) {
         for (int i = 0; i < array.length; i++) {
-            if (array[i] == txt) { return; }
+            if (array[i] == txt) {
+                return;
+            }
         }
         Character[] bytes = new Character[array.length];
         for (int i = 0; i < array.length; i++) {
@@ -170,6 +183,5 @@
         }
         fail(formatContainsMessage(message, bytes, txt));
     }
-    
 
 }

Copied: felix/trunk/ipojo/examples/junit4osgi/junit4osgi/src/main/java/org/apache/felix/ipojo/junit4osgi/OSGiTestSuite.java (from r640936, felix/sandbox/clement/ipojo/examples/junit4osgi/junit4osgi/src/main/java/org/apache/felix/ipojo/junit4osgi/OSGiTestSuite.java)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/junit4osgi/junit4osgi/src/main/java/org/apache/felix/ipojo/junit4osgi/OSGiTestSuite.java?p2=felix/trunk/ipojo/examples/junit4osgi/junit4osgi/src/main/java/org/apache/felix/ipojo/junit4osgi/OSGiTestSuite.java&p1=felix/sandbox/clement/ipojo/examples/junit4osgi/junit4osgi/src/main/java/org/apache/felix/ipojo/junit4osgi/OSGiTestSuite.java&r1=640936&r2=642265&rev=642265&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/examples/junit4osgi/junit4osgi/src/main/java/org/apache/felix/ipojo/junit4osgi/OSGiTestSuite.java (original)
+++ felix/trunk/ipojo/examples/junit4osgi/junit4osgi/src/main/java/org/apache/felix/ipojo/junit4osgi/OSGiTestSuite.java Fri Mar 28 08:33:36 2008
@@ -28,37 +28,36 @@
 /**
  * OSGi Test Suite.
  * Allow the injection of the bundle context.
- * 
  * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */
 public class OSGiTestSuite extends TestSuite {
-    
+
     protected BundleContext context;
-    
+
     public OSGiTestSuite(Class clazz, BundleContext bc) {
-       super(clazz);
-       context = bc;
+        super(clazz);
+        context = bc;
     }
-    
+
     public OSGiTestSuite(BundleContext bc) {
         super();
         context = bc;
     }
-    
+
     public OSGiTestSuite(String name, BundleContext bc) {
         super(name);
         context = bc;
     }
-    
+
     public OSGiTestSuite(Class clazz, String name, BundleContext bc) {
         super(clazz, name);
         context = bc;
     }
-    
+
     public void setBundleContext(BundleContext bc) {
         context = bc;
     }
-    
+
     /**
      * Adds the tests from the given class to the suite
      */
@@ -71,8 +70,7 @@
             System.out.println("Error : the " + testClass + " is not a valid test class");
         }
     }
-    
-    
+
     public void runTest(Test test, TestResult result) {
         if (test instanceof OSGiTestSuite) {
             ((OSGiTestSuite) test).context = context;
@@ -83,8 +81,7 @@
         } else {
             test.run(result);
         }
-        
-        
+
     }
 
 }

Copied: felix/trunk/ipojo/examples/junit4osgi/junit4osgi/src/main/java/org/apache/felix/ipojo/junit4osgi/impl/JunitExtender.java (from r640936, felix/sandbox/clement/ipojo/examples/junit4osgi/junit4osgi/src/main/java/org/apache/felix/ipojo/junit4osgi/impl/JunitExtender.java)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/junit4osgi/junit4osgi/src/main/java/org/apache/felix/ipojo/junit4osgi/impl/JunitExtender.java?p2=felix/trunk/ipojo/examples/junit4osgi/junit4osgi/src/main/java/org/apache/felix/ipojo/junit4osgi/impl/JunitExtender.java&p1=felix/sandbox/clement/ipojo/examples/junit4osgi/junit4osgi/src/main/java/org/apache/felix/ipojo/junit4osgi/impl/JunitExtender.java&r1=640936&r2=642265&rev=642265&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/examples/junit4osgi/junit4osgi/src/main/java/org/apache/felix/ipojo/junit4osgi/impl/JunitExtender.java (original)
+++ felix/trunk/ipojo/examples/junit4osgi/junit4osgi/src/main/java/org/apache/felix/ipojo/junit4osgi/impl/JunitExtender.java Fri Mar 28 08:33:36 2008
@@ -256,7 +256,9 @@
         }
 
         if (meth != null) {
-            meth.setAccessible(true);
+            if (! meth.isAccessible()) {
+                meth.setAccessible(true);
+            }
             try {
                 return (BundleContext) meth.invoke(bundle, new Object[0]);
             } catch (IllegalArgumentException e) {
@@ -275,7 +277,9 @@
         Field[] fields = bundle.getClass().getDeclaredFields();
         for (int i = 0; i < fields.length; i++) {
             if (BundleContext.class.isAssignableFrom(fields[i].getType())) {
-                fields[i].setAccessible(true);
+                if (! fields[i].isAccessible()) {
+                    fields[i].setAccessible(true);
+                }
                 try {
                     return (BundleContext) fields[i].get(bundle);
                 } catch (IllegalArgumentException e) {

Copied: felix/trunk/ipojo/examples/junit4osgi/junit4osgi/src/main/java/org/apache/felix/ipojo/junit4osgi/impl/ResultPrinter.java (from r640936, felix/sandbox/clement/ipojo/examples/junit4osgi/junit4osgi/src/main/java/org/apache/felix/ipojo/junit4osgi/impl/ResultPrinter.java)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/junit4osgi/junit4osgi/src/main/java/org/apache/felix/ipojo/junit4osgi/impl/ResultPrinter.java?p2=felix/trunk/ipojo/examples/junit4osgi/junit4osgi/src/main/java/org/apache/felix/ipojo/junit4osgi/impl/ResultPrinter.java&p1=felix/sandbox/clement/ipojo/examples/junit4osgi/junit4osgi/src/main/java/org/apache/felix/ipojo/junit4osgi/impl/ResultPrinter.java&r1=640936&r2=642265&rev=642265&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/examples/junit4osgi/junit4osgi/src/main/java/org/apache/felix/ipojo/junit4osgi/impl/ResultPrinter.java (original)
+++ felix/trunk/ipojo/examples/junit4osgi/junit4osgi/src/main/java/org/apache/felix/ipojo/junit4osgi/impl/ResultPrinter.java Fri Mar 28 08:33:36 2008
@@ -31,7 +31,6 @@
 
 /**
  * Result Printer.
- * 
  * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */
 public class ResultPrinter implements TestListener {

Propchange: felix/trunk/ipojo/examples/junit4osgi/swing-runner/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 28 08:33:36 2008
@@ -0,0 +1,9 @@
+.checkstyle
+.classpath
+.project
+bin
+nbproject
+target
+maven-eclipse.xml
+.externalToolBuilders
+.settings

Copied: felix/trunk/ipojo/examples/junit4osgi/swing-runner/pom.xml (from r640936, felix/sandbox/clement/ipojo/examples/junit4osgi/swing-runner/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/junit4osgi/swing-runner/pom.xml?p2=felix/trunk/ipojo/examples/junit4osgi/swing-runner/pom.xml&p1=felix/sandbox/clement/ipojo/examples/junit4osgi/swing-runner/pom.xml&r1=640936&r2=642265&rev=642265&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/examples/junit4osgi/swing-runner/pom.xml (original)
+++ felix/trunk/ipojo/examples/junit4osgi/swing-runner/pom.xml Fri Mar 28 08:33:36 2008
@@ -1,4 +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.
+-->
 <project>
 	<parent>
 		<groupId>ipojo.examples</groupId>
@@ -44,9 +61,15 @@
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
-						<Bundle-Name>iPOJO OSGi Junit Runner - Swing Gui</Bundle-Name>
-						<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-						<Private-Package>org.apache.felix.ipojo.junit4osgi.command</Private-Package>
+						<Bundle-Name>
+							iPOJO OSGi Junit Runner - Swing Gui
+						</Bundle-Name>
+						<Bundle-SymbolicName>
+							${pom.artifactId}
+						</Bundle-SymbolicName>
+						<Private-Package>
+							org.apache.felix.ipojo.junit4osgi.command
+						</Private-Package>
 					</instructions>
 				</configuration>
 			</plugin>
@@ -68,10 +91,15 @@
 		</plugins>
 	</build>
 	<repositories>
-        <repository>
-            <id>unknown-jars-temp-repo</id>
-            <name>A temporary repository created by NetBeans for libraries and jars it could not identify. Please replace the dependencies in this repository with correct ones and delete this repository.</name>
-            <url>file:${project.basedir}/lib</url>
-        </repository>
-    </repositories>
+		<repository>
+			<id>unknown-jars-temp-repo</id>
+			<name>
+				A temporary repository created by NetBeans for libraries
+				and jars it could not identify. Please replace the
+				dependencies in this repository with correct ones and
+				delete this repository.
+			</name>
+			<url>file:${project.basedir}/lib</url>
+		</repository>
+	</repositories>
 </project>

Propchange: felix/trunk/ipojo/examples/property-handler/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 28 08:33:36 2008
@@ -0,0 +1,5 @@
+target*
+.classpath*
+.setting*
+.project*
+bin*

Propchange: felix/trunk/ipojo/examples/property-handler/PropertyHandler/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 28 08:33:36 2008
@@ -0,0 +1,8 @@
+target*
+.classpath*
+.setting*
+.project*
+bin*
+maven-eclipse.xml
+*.checkstyle
+.externalToolBuilders

Copied: felix/trunk/ipojo/examples/property-handler/PropertyHandler/metadata.xml (from r640936, felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandler/metadata.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/property-handler/PropertyHandler/metadata.xml?p2=felix/trunk/ipojo/examples/property-handler/PropertyHandler/metadata.xml&p1=felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandler/metadata.xml&r1=640936&r2=642265&rev=642265&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandler/metadata.xml (original)
+++ felix/trunk/ipojo/examples/property-handler/PropertyHandler/metadata.xml Fri Mar 28 08:33:36 2008
@@ -1,8 +1,9 @@
 <ipojo xmlns:props="example.handler.properties">
-
-<!-- Declare the handler -->
-<handler name="properties" namespace="example.handler.properties" classname="org.apache.felix.ipojo.handler.properties.PropertiesHandler">
-	<!--  the properties handler does not use any other handler -->
-</handler>
-
+
+	<!-- Declare the handler -->
+	<handler name="properties" namespace="example.handler.properties"
+		classname="org.apache.felix.ipojo.handler.properties.PropertiesHandler">
+		<!--  the properties handler does not use any other handler -->
+	</handler>
+
 </ipojo>

Copied: felix/trunk/ipojo/examples/property-handler/PropertyHandler/pom.xml (from r640936, felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandler/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/property-handler/PropertyHandler/pom.xml?p2=felix/trunk/ipojo/examples/property-handler/PropertyHandler/pom.xml&p1=felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandler/pom.xml&r1=640936&r2=642265&rev=642265&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandler/pom.xml (original)
+++ felix/trunk/ipojo/examples/property-handler/PropertyHandler/pom.xml Fri Mar 28 08:33:36 2008
@@ -1,62 +1,85 @@
+<!--
+	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>
-  <parent>
-    <groupId>ipojo.examples</groupId>
-  	<artifactId>ipojo.examples.property.handler</artifactId>
-  	<version>0.7.6-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <packaging>bundle</packaging>
-  <name>Apache Felix iPOJO Property Handler</name>
-  <artifactId>org.apache.felix.ipojo.example.handler.property</artifactId>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.ipojo</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.ipojo.metadata</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-  </dependencies>
-  <build>
-  <plugins>
-  <plugin>
-		<groupId>org.apache.maven.plugins</groupId>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		<source>1.5</source>
-		<target>1.5</target>
-		</configuration>
-	  </plugin>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.4.0</version>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Private-Package>org.apache.felix.ipojo.handler.properties, example.handler.properties</Private-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-      <plugin>
-	      <groupId>org.apache.felix</groupId>
-	      <artifactId>maven-ipojo-plugin</artifactId>
-              <version>${pom.version}</version>
-		  <executions>
-          	<execution>
-            	<goals>
-	              <goal>ipojo-bundle</goal>
-               </goals>
-            <configuration>
-   				<ignoreAnnotations>true</ignoreAnnotations>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-   </build>
+	<parent>
+		<groupId>ipojo.examples</groupId>
+		<artifactId>ipojo.examples.property.handler</artifactId>
+		<version>0.7.6-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<packaging>bundle</packaging>
+	<name>Apache Felix iPOJO Property Handler</name>
+	<artifactId>
+		org.apache.felix.ipojo.example.handler.property
+	</artifactId>
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.apache.felix.ipojo</artifactId>
+			<version>${pom.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.apache.felix.ipojo.metadata</artifactId>
+			<version>${pom.version}</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.5</source>
+					<target>1.5</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<version>1.4.0</version>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Private-Package>
+							org.apache.felix.ipojo.handler.properties,
+							example.handler.properties
+						</Private-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-ipojo-plugin</artifactId>
+				<version>${pom.version}</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>ipojo-bundle</goal>
+						</goals>
+						<configuration>
+							<ignoreAnnotations>true</ignoreAnnotations>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 </project>

Propchange: felix/trunk/ipojo/examples/property-handler/PropertyHandler/src/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 28 08:33:36 2008
@@ -0,0 +1,5 @@
+target*
+.classpath*
+.setting*
+.project*
+bin*

Propchange: felix/trunk/ipojo/examples/property-handler/PropertyHandler/src/main/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 28 08:33:36 2008
@@ -0,0 +1,5 @@
+target*
+.classpath*
+.setting*
+.project*
+bin*

Propchange: felix/trunk/ipojo/examples/property-handler/PropertyHandler/src/main/java/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 28 08:33:36 2008
@@ -0,0 +1,5 @@
+target*
+.classpath*
+.setting*
+.project*
+bin*

Propchange: felix/trunk/ipojo/examples/property-handler/PropertyHandler/src/main/java/example/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 28 08:33:36 2008
@@ -0,0 +1,5 @@
+target*
+.classpath*
+.setting*
+.project*
+bin*

Propchange: felix/trunk/ipojo/examples/property-handler/PropertyHandler/src/main/java/example/handler/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 28 08:33:36 2008
@@ -0,0 +1,5 @@
+target*
+.classpath*
+.setting*
+.project*
+bin*

Propchange: felix/trunk/ipojo/examples/property-handler/PropertyHandler/src/main/java/example/handler/properties/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 28 08:33:36 2008
@@ -0,0 +1,5 @@
+target*
+.classpath*
+.setting*
+.project*
+bin*

Copied: felix/trunk/ipojo/examples/property-handler/PropertyHandler/src/main/java/example/handler/properties/Properties.java (from r640936, felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandler/src/main/java/example/handler/properties/Properties.java)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/property-handler/PropertyHandler/src/main/java/example/handler/properties/Properties.java?p2=felix/trunk/ipojo/examples/property-handler/PropertyHandler/src/main/java/example/handler/properties/Properties.java&p1=felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandler/src/main/java/example/handler/properties/Properties.java&r1=640936&r2=642265&rev=642265&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandler/src/main/java/example/handler/properties/Properties.java (original)
+++ felix/trunk/ipojo/examples/property-handler/PropertyHandler/src/main/java/example/handler/properties/Properties.java Fri Mar 28 08:33:36 2008
@@ -21,12 +21,12 @@
 /**
  * The Properties annotation.
  * This annotation may be used in POJO class to used the Property handler.
+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */
 public @interface Properties {
     
     /**
      * Returns the property file used by the handler.
-     * @return the property file path.
      */
     String file();
 

Propchange: felix/trunk/ipojo/examples/property-handler/PropertyHandler/src/main/java/org/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 28 08:33:36 2008
@@ -0,0 +1,5 @@
+target*
+.classpath*
+.setting*
+.project*
+bin*

Propchange: felix/trunk/ipojo/examples/property-handler/PropertyHandler/src/main/java/org/apache/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 28 08:33:36 2008
@@ -0,0 +1,5 @@
+target*
+.classpath*
+.setting*
+.project*
+bin*

Propchange: felix/trunk/ipojo/examples/property-handler/PropertyHandler/src/main/java/org/apache/felix/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 28 08:33:36 2008
@@ -0,0 +1,5 @@
+target*
+.classpath*
+.setting*
+.project*
+bin*

Propchange: felix/trunk/ipojo/examples/property-handler/PropertyHandler/src/main/java/org/apache/felix/ipojo/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 28 08:33:36 2008
@@ -0,0 +1,5 @@
+target*
+.classpath*
+.setting*
+.project*
+bin*

Propchange: felix/trunk/ipojo/examples/property-handler/PropertyHandler/src/main/java/org/apache/felix/ipojo/handler/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 28 08:33:36 2008
@@ -0,0 +1,5 @@
+target*
+.classpath*
+.setting*
+.project*
+bin*

Propchange: felix/trunk/ipojo/examples/property-handler/PropertyHandler/src/main/java/org/apache/felix/ipojo/handler/properties/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 28 08:33:36 2008
@@ -0,0 +1,5 @@
+target*
+.classpath*
+.setting*
+.project*
+bin*

Copied: felix/trunk/ipojo/examples/property-handler/PropertyHandler/src/main/java/org/apache/felix/ipojo/handler/properties/PropertiesHandler.java (from r640936, felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandler/src/main/java/org/apache/felix/ipojo/handler/properties/PropertiesHandler.java)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/property-handler/PropertyHandler/src/main/java/org/apache/felix/ipojo/handler/properties/PropertiesHandler.java?p2=felix/trunk/ipojo/examples/property-handler/PropertyHandler/src/main/java/org/apache/felix/ipojo/handler/properties/PropertiesHandler.java&p1=felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandler/src/main/java/org/apache/felix/ipojo/handler/properties/PropertiesHandler.java&r1=640936&r2=642265&rev=642265&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandler/src/main/java/org/apache/felix/ipojo/handler/properties/PropertiesHandler.java (original)
+++ felix/trunk/ipojo/examples/property-handler/PropertyHandler/src/main/java/org/apache/felix/ipojo/handler/properties/PropertiesHandler.java Fri Mar 28 08:33:36 2008
@@ -40,18 +40,19 @@
 /**
  * This handler load a properties file containing property value. The handler injects this values inside fields. When stopping the handler stores
  * updated value inside the file. The properties file contains [field-name: field-value] (field-value are strings) Metadata :
- * <example.handler.properties:properties file="file-path"> Instances can override file locations by setting the properties.file property.
+ * &lt;example.handler.properties:properties file="file-path"&gt; Instances can override file locations by setting the properties.file property.
+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */
 public class PropertiesHandler extends PrimitiveHandler {
+    
+    /** The Handler NAMESPACE. */
+    private final String NAMESPACE = "example.handler.properties";
 
     /** Properties file. */
-    Properties m_properties = new Properties();
+    private Properties m_properties = new Properties();
 
     /** File location. */
-    String m_file;
-
-    /** The Handler NAMESPACE. */
-    private final String NAMESPACE = "example.handler.properties";
+    private String m_file;
 
     /**
      * This method is the first to be invoked. This method aims to configure the handler. It receives the component type metadata and the instance
@@ -62,6 +63,7 @@
      * @throws ConfigurationException : the configuration of the handler has failed.
      * @see org.apache.felix.ipojo.Handler#configure(org.apache.felix.ipojo.metadata.Element, java.util.Dictionary)
      */
+    @SuppressWarnings("unchecked")
     public void configure(Element metadata, Dictionary configuration) throws ConfigurationException {
         // Parse metadata to get <properties file="$file"/>
 
@@ -70,18 +72,18 @@
         switch (elem.length) {
             case 0:
                 // No matching element in metadata, throw a configuration error.
-                new ConfigurationException("No properties found");
+                throw new ConfigurationException("No properties found");
             case 1:
                 // One 'properties' found, get attributes.
                 m_file = elem[0].getAttribute("file");
                 if (m_file == null) {
                     // if file is null, throw a configuration error.
-                    new ConfigurationException("Malformed properties element : file attribute must be set");
+                    throw new ConfigurationException("Malformed properties element : file attribute must be set");
                 }
                 break;
             default:
                 // To simplify we handle only one properties element.
-                new ConfigurationException("Only one properties element is supported");
+                throw new ConfigurationException("Only one properties element is supported");
         }
 
         // Look if the instance overrides file location :
@@ -102,7 +104,6 @@
 
         //First get Pojo Metadata metadata :
         PojoMetadata pojoMeta = getPojoMetadata();
-        int i = 0;
         Enumeration e = m_properties.keys();
         while (e.hasMoreElements()) {
             String field = (String) e.nextElement();
@@ -198,6 +199,7 @@
      * @param dict : new properties
      * @see org.apache.felix.ipojo.Handler#reconfigure(java.util.Dictionary)
      */
+    @SuppressWarnings("unchecked")
     public synchronized void reconfigure(Dictionary dict) {
         // For each property, look if a new value is contained in the new configuration.
         Enumeration e = m_properties.keys();
@@ -262,6 +264,7 @@
          * @return the description of the handler.
          * @see org.apache.felix.ipojo.architecture.HandlerDescription#getHandlerInfo()
          */
+        @SuppressWarnings("unchecked")
         public Element getHandlerInfo() {
             Element elem = super.getHandlerInfo(); // This method must be called to get the root description element.
             Enumeration e = m_properties.keys();

Propchange: felix/trunk/ipojo/examples/property-handler/PropertyHandlerTest/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 28 08:33:36 2008
@@ -0,0 +1,8 @@
+target*
+.classpath*
+.setting*
+.project*
+bin*
+maven-eclipse.xml
+.checkstyle
+.externalToolBuilders

Copied: felix/trunk/ipojo/examples/property-handler/PropertyHandlerTest/metadata.xml (from r640936, felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandlerTest/metadata.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/property-handler/PropertyHandlerTest/metadata.xml?p2=felix/trunk/ipojo/examples/property-handler/PropertyHandlerTest/metadata.xml&p1=felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandlerTest/metadata.xml&r1=640936&r2=642265&rev=642265&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandlerTest/metadata.xml (original)
+++ felix/trunk/ipojo/examples/property-handler/PropertyHandlerTest/metadata.xml Fri Mar 28 08:33:36 2008
@@ -1,17 +1,21 @@
 <ipojo xmlns:props="example.handler.properties">
 
-<!-- Declare a component using your handler -->
-<component classname="org.apache.felix.ipojo.handler.properties.example.PropertiesTester">
-	<callback transition="validate" method="start"/>
-	<callback transition="invalidate" method="stop"/>
-	<!--  declare our handler -->
-	<props:properties file="props\properties.txt"/>
-</component>
+	<!-- Declare a component using your handler -->
+	<component
+		classname="org.apache.felix.ipojo.handler.properties.example.PropertiesTester">
+		<callback transition="validate" method="start" />
+		<callback transition="invalidate" method="stop" />
+		<!--  declare our handler -->
+		<props:properties file="props\properties.txt" />
+	</component>
+
+	<!-- Declare an instance -->
+	<instance component="annotationTester" />
+	<instance
+		component="org.apache.felix.ipojo.handler.properties.example.PropertiesTester"
+		name="i1">
+		<property name="properties.file"
+			value="props\properties-i1.txt" />
+	</instance>
 
-<!-- Declare an instance -->
-<instance component="annotationTester"/>
-<instance component="org.apache.felix.ipojo.handler.properties.example.PropertiesTester" name="i1">
-	<property name="properties.file" value="props\properties-i1.txt"/>
-</instance>
-
 </ipojo>

Copied: felix/trunk/ipojo/examples/property-handler/PropertyHandlerTest/pom.xml (from r640936, felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandlerTest/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/property-handler/PropertyHandlerTest/pom.xml?p2=felix/trunk/ipojo/examples/property-handler/PropertyHandlerTest/pom.xml&p1=felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandlerTest/pom.xml&r1=640936&r2=642265&rev=642265&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandlerTest/pom.xml (original)
+++ felix/trunk/ipojo/examples/property-handler/PropertyHandlerTest/pom.xml Fri Mar 28 08:33:36 2008
@@ -1,59 +1,83 @@
+<!--
+	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>
-   <parent>
-    <groupId>ipojo.examples</groupId>
-  	<artifactId>ipojo.examples.property.handler</artifactId>
-  	<version>0.7.6-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <packaging>bundle</packaging>
-  <name>Apache Felix iPOJO Property Handler Test</name>
-  <artifactId>org.apache.felix.ipojo.example.handler.property.test</artifactId>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.ipojo.annotations</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>ipojo.examples</groupId>
-      <artifactId>org.apache.felix.ipojo.example.handler.property</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-  </dependencies>
-  <build>
-  <plugins>
-  <plugin>
-		<groupId>org.apache.maven.plugins</groupId>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		<source>1.5</source>
-		<target>1.5</target>
-		</configuration>
-	  </plugin>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.4.0</version>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Private-Package>org.apache.felix.ipojo.handler.properties.example</Private-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-      <plugin>
-	      <groupId>org.apache.felix</groupId>
-	      <artifactId>maven-ipojo-plugin</artifactId>
-              <version>${pom.version}</version>
-		  <executions>
-          	<execution>
-            	<goals>
-	              <goal>ipojo-bundle</goal>
-               </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-   </build>
+	<parent>
+		<groupId>ipojo.examples</groupId>
+		<artifactId>ipojo.examples.property.handler</artifactId>
+		<version>0.7.6-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<packaging>bundle</packaging>
+	<name>Apache Felix iPOJO Property Handler Test</name>
+	<artifactId>
+		org.apache.felix.ipojo.example.handler.property.test
+	</artifactId>
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.apache.felix.ipojo.annotations</artifactId>
+			<version>${pom.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>ipojo.examples</groupId>
+			<artifactId>
+				org.apache.felix.ipojo.example.handler.property
+			</artifactId>
+			<version>${pom.version}</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.5</source>
+					<target>1.5</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<version>1.4.0</version>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Private-Package>
+							org.apache.felix.ipojo.handler.properties.example
+						</Private-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-ipojo-plugin</artifactId>
+				<version>${pom.version}</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>ipojo-bundle</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 </project>

Propchange: felix/trunk/ipojo/examples/property-handler/PropertyHandlerTest/props/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 28 08:33:36 2008
@@ -0,0 +1,5 @@
+target*
+.classpath*
+.setting*
+.project*
+bin*

Copied: felix/trunk/ipojo/examples/property-handler/PropertyHandlerTest/props/properties-i1.txt (from r640936, felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandlerTest/props/properties-i1.txt)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/property-handler/PropertyHandlerTest/props/properties-i1.txt?p2=felix/trunk/ipojo/examples/property-handler/PropertyHandlerTest/props/properties-i1.txt&p1=felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandlerTest/props/properties-i1.txt&r1=640936&r2=642265&rev=642265&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandlerTest/props/properties-i1.txt (original)
+++ felix/trunk/ipojo/examples/property-handler/PropertyHandlerTest/props/properties-i1.txt Fri Mar 28 08:33:36 2008
@@ -1,4 +1,4 @@
 #
 #Sun Nov 18 20:33:54 CET 2007
-property2=foo - 18 nov. 2007 20\:32\:55 - 18 nov. 2007 20\:33\:51
-property1=bar - 18 nov. 2007 20\:32\:55 - 18 nov. 2007 20\:33\:51
+m_property2=foo - 18 nov. 2007 20\:32\:55 - 18 nov. 2007 20\:33\:51
+m_property1=bar - 18 nov. 2007 20\:32\:55 - 18 nov. 2007 20\:33\:51

Copied: felix/trunk/ipojo/examples/property-handler/PropertyHandlerTest/props/properties.txt (from r640936, felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandlerTest/props/properties.txt)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/property-handler/PropertyHandlerTest/props/properties.txt?p2=felix/trunk/ipojo/examples/property-handler/PropertyHandlerTest/props/properties.txt&p1=felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandlerTest/props/properties.txt&r1=640936&r2=642265&rev=642265&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandlerTest/props/properties.txt (original)
+++ felix/trunk/ipojo/examples/property-handler/PropertyHandlerTest/props/properties.txt Fri Mar 28 08:33:36 2008
@@ -1,4 +1,4 @@
 #
 #Sun Nov 18 20:33:54 CET 2007
-property2=prop2 - 18 nov. 2007 20\:32\:55 - 18 nov. 2007 20\:33\:51
-property1=prop1 - 18 nov. 2007 20\:32\:55 - 18 nov. 2007 20\:33\:51
+m_property2=prop2 - 18 nov. 2007 20\:32\:55 - 18 nov. 2007 20\:33\:51
+m_property1=prop1 - 18 nov. 2007 20\:32\:55 - 18 nov. 2007 20\:33\:51

Propchange: felix/trunk/ipojo/examples/property-handler/PropertyHandlerTest/src/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 28 08:33:36 2008
@@ -0,0 +1,5 @@
+target*
+.classpath*
+.setting*
+.project*
+bin*

Propchange: felix/trunk/ipojo/examples/property-handler/PropertyHandlerTest/src/main/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 28 08:33:36 2008
@@ -0,0 +1,5 @@
+target*
+.classpath*
+.setting*
+.project*
+bin*

Propchange: felix/trunk/ipojo/examples/property-handler/PropertyHandlerTest/src/main/java/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 28 08:33:36 2008
@@ -0,0 +1,5 @@
+target*
+.classpath*
+.setting*
+.project*
+bin*

Propchange: felix/trunk/ipojo/examples/property-handler/PropertyHandlerTest/src/main/java/org/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 28 08:33:36 2008
@@ -0,0 +1,5 @@
+target*
+.classpath*
+.setting*
+.project*
+bin*

Propchange: felix/trunk/ipojo/examples/property-handler/PropertyHandlerTest/src/main/java/org/apache/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 28 08:33:36 2008
@@ -0,0 +1,5 @@
+target*
+.classpath*
+.setting*
+.project*
+bin*

Propchange: felix/trunk/ipojo/examples/property-handler/PropertyHandlerTest/src/main/java/org/apache/felix/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 28 08:33:36 2008
@@ -0,0 +1,5 @@
+target*
+.classpath*
+.setting*
+.project*
+bin*

Propchange: felix/trunk/ipojo/examples/property-handler/PropertyHandlerTest/src/main/java/org/apache/felix/ipojo/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 28 08:33:36 2008
@@ -0,0 +1,5 @@
+target*
+.classpath*
+.setting*
+.project*
+bin*

Propchange: felix/trunk/ipojo/examples/property-handler/PropertyHandlerTest/src/main/java/org/apache/felix/ipojo/handler/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 28 08:33:36 2008
@@ -0,0 +1,5 @@
+target*
+.classpath*
+.setting*
+.project*
+bin*

Propchange: felix/trunk/ipojo/examples/property-handler/PropertyHandlerTest/src/main/java/org/apache/felix/ipojo/handler/properties/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 28 08:33:36 2008
@@ -0,0 +1,5 @@
+target*
+.classpath*
+.setting*
+.project*
+bin*

Propchange: felix/trunk/ipojo/examples/property-handler/PropertyHandlerTest/src/main/java/org/apache/felix/ipojo/handler/properties/example/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 28 08:33:36 2008
@@ -0,0 +1,5 @@
+target*
+.classpath*
+.setting*
+.project*
+bin*

Copied: felix/trunk/ipojo/examples/property-handler/PropertyHandlerTest/src/main/java/org/apache/felix/ipojo/handler/properties/example/AnnotationPropertiesTester.java (from r640936, felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandlerTest/src/main/java/org/apache/felix/ipojo/handler/properties/example/AnnotationPropertiesTester.java)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/property-handler/PropertyHandlerTest/src/main/java/org/apache/felix/ipojo/handler/properties/example/AnnotationPropertiesTester.java?p2=felix/trunk/ipojo/examples/property-handler/PropertyHandlerTest/src/main/java/org/apache/felix/ipojo/handler/properties/example/AnnotationPropertiesTester.java&p1=felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandlerTest/src/main/java/org/apache/felix/ipojo/handler/properties/example/AnnotationPropertiesTester.java&r1=640936&r2=642265&rev=642265&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandlerTest/src/main/java/org/apache/felix/ipojo/handler/properties/example/AnnotationPropertiesTester.java (original)
+++ felix/trunk/ipojo/examples/property-handler/PropertyHandlerTest/src/main/java/org/apache/felix/ipojo/handler/properties/example/AnnotationPropertiesTester.java Fri Mar 28 08:33:36 2008
@@ -27,36 +27,57 @@
 
 import example.handler.properties.Properties;
 
-@Component(name="annotationTester")
-@Properties(file="props\\properties.txt")
+/**
+ * A simple component implementation using the property handler.
+ *@author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
+ */
+@Component(name = "annotationTester")
+@Properties(file = "props\\properties.txt")
 public class AnnotationPropertiesTester {
-    
-    // These two fields will be injected. 
-    private String property1;
-    private String property2;
-    
+ 
+    /**
+     * Property 1 : injected. 
+     */
+    private String m_property1;
+
+    /**
+     * Property 1 : injected. 
+     */
+    private String m_property2;
+
+    /**
+     * Start method : 
+     * displays loaded & injected properties before modifying them.
+     */
     @Validate
     public void start() {
         System.out.println("AnnotationPropertiesTester is starting ...");
-        System.out.println("Property 1 : " + property1);
-        System.out.println("Property 2 : " + property2);
-        
+        System.out.println("Property 1 : " + m_property1);
+        System.out.println("Property 2 : " + m_property2);
+
         updateProperties();
     }
-    
+
+    /**
+     * Stop method :
+     * displays properties values.
+     */
     @Invalidate
     public void stop() {
         System.out.println("AnnotationPropertiesTester is stopping ...");
-        System.out.println("Property 1 : " + property1);
-        System.out.println("Property 2 : " + property2);
+        System.out.println("Property 1 : " + m_property1);
+        System.out.println("Property 2 : " + m_property2);
     }
 
+    /**
+     * Update property value.
+     */
     private void updateProperties() {
-       System.out.println("Update properties");
-       Date date = new Date();
-       DateFormat df = DateFormat.getDateTimeInstance();
-       property1 = property1 + " - " + df.format(date);
-       property2 = property2 + " - " + df.format(date);
-        
+        System.out.println("Update properties");
+        Date date = new Date();
+        DateFormat df = DateFormat.getDateTimeInstance();
+        m_property1 = m_property1 + " - " + df.format(date);
+        m_property2 = m_property2 + " - " + df.format(date);
+
     }
 }

Propchange: felix/trunk/ipojo/examples/tutorial-maven/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 28 08:33:36 2008
@@ -0,0 +1,5 @@
+.classpath
+.project
+.settings
+bin*
+target*

Propchange: felix/trunk/ipojo/examples/tutorial-maven/hello.client/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 28 08:33:36 2008
@@ -0,0 +1,6 @@
+.classpath
+.project
+.settings
+bin*
+target*
+*.checkstyle

Propchange: felix/trunk/ipojo/examples/tutorial-maven/hello.client.annotation/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 28 08:33:36 2008
@@ -0,0 +1,6 @@
+.classpath
+.project
+.settings
+bin*
+target*
+*.checkstyle

Copied: felix/trunk/ipojo/examples/tutorial-maven/hello.client.annotation/src/main/java/ipojo/example/hello/client/HelloClient.java (from r640936, felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.client.annotation/src/main/java/ipojo/example/hello/client/HelloClient.java)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/tutorial-maven/hello.client.annotation/src/main/java/ipojo/example/hello/client/HelloClient.java?p2=felix/trunk/ipojo/examples/tutorial-maven/hello.client.annotation/src/main/java/ipojo/example/hello/client/HelloClient.java&p1=felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.client.annotation/src/main/java/ipojo/example/hello/client/HelloClient.java&r1=640936&r2=642265&rev=642265&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.client.annotation/src/main/java/ipojo/example/hello/client/HelloClient.java (original)
+++ felix/trunk/ipojo/examples/tutorial-maven/hello.client.annotation/src/main/java/ipojo/example/hello/client/HelloClient.java Fri Mar 28 08:33:36 2008
@@ -18,18 +18,22 @@
  */
 package ipojo.example.hello.client;
 
+import ipojo.example.hello.Hello;
+
 import org.apache.felix.ipojo.annotations.Component;
 import org.apache.felix.ipojo.annotations.Invalidate;
 import org.apache.felix.ipojo.annotations.Requires;
 import org.apache.felix.ipojo.annotations.Validate;
 
-import ipojo.example.hello.Hello;
-
 /**
  * A simple Hello service client. This client use annotation instead of XML metadata.
+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */
 @Component(name = "AnnotatedHelloClient", architecture = true)
 public class HelloClient implements Runnable {
+    
+    /** Delay between two invocations. */
+    private static final int DELAY = 10000;
 
     /**
      * Hello services. Injected by the container.
@@ -37,18 +41,17 @@
     @Requires
     private Hello[] m_hello;
 
-    /** Delay between two invocations. */
-    private final static int DELAY = 10000;
-
-    /** End flag */
-    private boolean end;
+    /**
+     *  End flag.
+     */
+    private boolean m_end;
 
     /**
      * Run method.
      * @see java.lang.Runnable#run()
      */
     public void run() {
-        while (!end) {
+        while (!m_end) {
             try {
                 invokeHelloServices();
                 Thread.sleep(DELAY);
@@ -72,9 +75,9 @@
      */
     @Validate
     public void starting() {
-        Thread T = new Thread(this);
-        end = false;
-        T.start();
+        Thread thread = new Thread(this);
+        m_end = false;
+        thread.start();
     }
 
     /**
@@ -82,6 +85,6 @@
      */
     @Invalidate
     public void stopping() {
-        end = true;
+        m_end = true;
     }
-}
\ No newline at end of file
+}

Copied: felix/trunk/ipojo/examples/tutorial-maven/hello.client/metadata.xml (from r640936, felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.client/metadata.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/tutorial-maven/hello.client/metadata.xml?p2=felix/trunk/ipojo/examples/tutorial-maven/hello.client/metadata.xml&p1=felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.client/metadata.xml&r1=640936&r2=642265&rev=642265&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.client/metadata.xml (original)
+++ felix/trunk/ipojo/examples/tutorial-maven/hello.client/metadata.xml Fri Mar 28 08:33:36 2008
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <iPOJO>
-  <component className="ipojo.example.hello.client.HelloClient" architecture="true">
-    <requires field="m_hello"/>
-    <callback transition="validate" method="starting"/>
-    <callback transition="invalidate" method="stopping"/>
-    <properties>
-    	<property field="m_name" name="name"/>
-    </properties>
-  </component>
-  <instance component="ipojo.example.hello.client.HelloClient" name="HelloClient">
-  	<property name="name" value="adriana"/>
-  </instance>
-    <instance component="ipojo.example.hello.client.HelloClient">
-  	<property name="name" value="francois"/>
-  </instance>
+	<component className="ipojo.example.hello.client.HelloClient"
+		architecture="true">
+		<requires field="m_hello" />
+		<callback transition="validate" method="starting" />
+		<callback transition="invalidate" method="stopping" />
+		<properties>
+			<property field="m_name" name="name" />
+		</properties>
+	</component>
+	<instance component="ipojo.example.hello.client.HelloClient">
+		<property name="name" value="clement" />
+	</instance>
 </iPOJO>

Copied: felix/trunk/ipojo/examples/tutorial-maven/hello.client/pom.xml (from r640936, felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.client/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/tutorial-maven/hello.client/pom.xml?p2=felix/trunk/ipojo/examples/tutorial-maven/hello.client/pom.xml&p1=felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.client/pom.xml&r1=640936&r2=642265&rev=642265&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.client/pom.xml (original)
+++ felix/trunk/ipojo/examples/tutorial-maven/hello.client/pom.xml Fri Mar 28 08:33:36 2008
@@ -1,60 +1,82 @@
+<!--
+	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>
-  <modelVersion>4.0.0</modelVersion>
-  <packaging>bundle</packaging><!-- Use the BND Maven plug-in -->
-  <groupId>ipojo.examples</groupId>
-  <artifactId>hello.client</artifactId>
-   <version>0.7.6-SNAPSHOT</version>
-  <name>Hello Service Client</name>
-  <dependencies>
-    <dependency>
-      <groupId>ipojo.examples</groupId>
-      <artifactId>hello.service</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-  </dependencies>
-  
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>snapshot plugins</name>
-      <url>
-        http://people.apache.org/repo/m2-snapshot-repository
-      </url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </pluginRepository>
-  </pluginRepositories>
-  
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <version>1.4.0</version>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-            <Private-Package>ipojo.example.hello.client</Private-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-      <plugin>
-	      <groupId>org.apache.felix</groupId>
-	      <artifactId>maven-ipojo-plugin</artifactId>
-	      <version>0.7.6-SNAPSHOT</version>
-		  <executions>
-          	<execution>
-            	<goals>
-	              <goal>ipojo-bundle</goal>
-               </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
+	<modelVersion>4.0.0</modelVersion>
+	<packaging>bundle</packaging><!-- Use the BND Maven plug-in -->
+	<groupId>ipojo.examples</groupId>
+	<artifactId>hello.client</artifactId>
+	<version>0.7.6-SNAPSHOT</version>
+	<name>Hello Service Client</name>
+	<dependencies>
+		<dependency>
+			<groupId>ipojo.examples</groupId>
+			<artifactId>hello.service</artifactId>
+			<version>${pom.version}</version>
+		</dependency>
+	</dependencies>
+
+	<pluginRepositories>
+		<pluginRepository>
+			<id>apache.snapshots</id>
+			<name>snapshot plugins</name>
+			<url>
+				http://people.apache.org/repo/m2-snapshot-repository
+			</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+	</pluginRepositories>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<version>1.4.0</version>
+				<configuration>
+					<instructions>
+						<Bundle-SymbolicName>
+							${pom.artifactId}
+						</Bundle-SymbolicName>
+						<Private-Package>
+							ipojo.example.hello.client
+						</Private-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-ipojo-plugin</artifactId>
+				<version>0.7.6-SNAPSHOT</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>ipojo-bundle</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 </project>

Copied: felix/trunk/ipojo/examples/tutorial-maven/hello.client/src/main/java/ipojo/example/hello/client/HelloClient.java (from r640936, felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.client/src/main/java/ipojo/example/hello/client/HelloClient.java)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/tutorial-maven/hello.client/src/main/java/ipojo/example/hello/client/HelloClient.java?p2=felix/trunk/ipojo/examples/tutorial-maven/hello.client/src/main/java/ipojo/example/hello/client/HelloClient.java&p1=felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.client/src/main/java/ipojo/example/hello/client/HelloClient.java&r1=640936&r2=642265&rev=642265&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.client/src/main/java/ipojo/example/hello/client/HelloClient.java (original)
+++ felix/trunk/ipojo/examples/tutorial-maven/hello.client/src/main/java/ipojo/example/hello/client/HelloClient.java Fri Mar 28 08:33:36 2008
@@ -22,20 +22,25 @@
 
 /**
  * Hello Service simple client.
+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */
 public class HelloClient implements Runnable {
 
+    /**
+     *  Delay between two invocations. 
+     */
+    private static final int DELAY = 10000;
+    
     /** 
      * Hello services. 
      * Injected by the container.
      * */
     private Hello[] m_hello; // Service Requirement
 
-    /** Delay between two invocations. */
-    private final static int DELAY = 10000;
-
-    /** End flag */
-    private boolean end;
+    /** 
+     * End flag.
+     *  */
+    private boolean m_end;
 
     /** 
      * Name property.
@@ -48,7 +53,7 @@
      * @see java.lang.Runnable#run()
      */
     public void run() {
-        while (!end) {
+        while (!m_end) {
             try {
                 invokeHelloServices();
                 Thread.sleep(DELAY);
@@ -71,15 +76,15 @@
      * Starting.
      */
     public void starting() {
-        Thread T = new Thread(this);
-        end = false;
-        T.start();
+        Thread thread = new Thread(this);
+        m_end = false;
+        thread.start();
     }
 
     /**
      * Stopping.
      */
     public void stopping() {
-        end = true;
+        m_end = true;
     }
-}
\ No newline at end of file
+}

Propchange: felix/trunk/ipojo/examples/tutorial-maven/hello.impl/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 28 08:33:36 2008
@@ -0,0 +1,6 @@
+.classpath
+.project
+.settings
+bin*
+target*
+*.checkstyle

Propchange: felix/trunk/ipojo/examples/tutorial-maven/hello.impl.annotation/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 28 08:33:36 2008
@@ -0,0 +1,6 @@
+.classpath
+.project
+.settings
+bin*
+target*
+*.checkstyle

Copied: felix/trunk/ipojo/examples/tutorial-maven/hello.impl.annotation/pom.xml (from r640936, felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.impl.annotation/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/tutorial-maven/hello.impl.annotation/pom.xml?p2=felix/trunk/ipojo/examples/tutorial-maven/hello.impl.annotation/pom.xml&p1=felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.impl.annotation/pom.xml&r1=640936&r2=642265&rev=642265&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.impl.annotation/pom.xml (original)
+++ felix/trunk/ipojo/examples/tutorial-maven/hello.impl.annotation/pom.xml Fri Mar 28 08:33:36 2008
@@ -1,64 +1,88 @@
+<!--
+	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>
-  <modelVersion>4.0.0</modelVersion>
-  <packaging>bundle</packaging>
-  <groupId>ipojo.examples</groupId>
-  <artifactId>hello.impl.annotation</artifactId>
-  <version>0.7.6-SNAPSHOT</version>
-  <name>Hello Service Provider using Annotations</name>
-  
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>snapshot plugins</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-    </pluginRepository>
-  </pluginRepositories>
-  
-  <dependencies>
-   <dependency>
-      <groupId>ipojo.examples</groupId>
-      <artifactId>hello.service</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.ipojo.annotations</artifactId>
-      <version>0.7.6-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-  
-  <build>
-    <plugins>
-    <plugin>
-		<groupId>org.apache.maven.plugins</groupId>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		<source>1.5</source>
-		<target>1.5</target>
-		</configuration>
-	  </plugin>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-            <Private-Package>ipojo.example.hello.impl</Private-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-      <plugin>
-	      <groupId>org.apache.felix</groupId>
-	      <artifactId>maven-ipojo-plugin</artifactId>
-		  <executions>
-          	<execution>
-            	<goals>
-	              <goal>ipojo-bundle</goal>
-               </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
+	<modelVersion>4.0.0</modelVersion>
+	<packaging>bundle</packaging>
+	<groupId>ipojo.examples</groupId>
+	<artifactId>hello.impl.annotation</artifactId>
+	<version>0.7.6-SNAPSHOT</version>
+	<name>Hello Service Provider using Annotations</name>
+
+	<pluginRepositories>
+		<pluginRepository>
+			<id>apache.snapshots</id>
+			<name>snapshot plugins</name>
+			<url>
+				http://people.apache.org/repo/m2-snapshot-repository
+			</url>
+		</pluginRepository>
+	</pluginRepositories>
+
+	<dependencies>
+		<dependency>
+			<groupId>ipojo.examples</groupId>
+			<artifactId>hello.service</artifactId>
+			<version>${pom.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.apache.felix.ipojo.annotations</artifactId>
+			<version>0.7.6-SNAPSHOT</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.5</source>
+					<target>1.5</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Bundle-SymbolicName>
+							${pom.artifactId}
+						</Bundle-SymbolicName>
+						<Private-Package>
+							ipojo.example.hello.impl
+						</Private-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-ipojo-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>ipojo-bundle</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 </project>

Copied: felix/trunk/ipojo/examples/tutorial-maven/hello.impl.annotation/src/main/java/ipojo/example/hello/impl/HelloImpl.java (from r640936, felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.impl.annotation/src/main/java/ipojo/example/hello/impl/HelloImpl.java)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/tutorial-maven/hello.impl.annotation/src/main/java/ipojo/example/hello/impl/HelloImpl.java?p2=felix/trunk/ipojo/examples/tutorial-maven/hello.impl.annotation/src/main/java/ipojo/example/hello/impl/HelloImpl.java&p1=felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.impl.annotation/src/main/java/ipojo/example/hello/impl/HelloImpl.java&r1=640936&r2=642265&rev=642265&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.impl.annotation/src/main/java/ipojo/example/hello/impl/HelloImpl.java (original)
+++ felix/trunk/ipojo/examples/tutorial-maven/hello.impl.annotation/src/main/java/ipojo/example/hello/impl/HelloImpl.java Fri Mar 28 08:33:36 2008
@@ -26,6 +26,7 @@
 /**
  * Component implementing the Hello service.
  * This class used annotations to describe the component type. 
+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */
 @Component
 @Provides
@@ -38,4 +39,4 @@
      * @see ipojo.example.hello.Hello#sayHello(java.lang.String)
      */
     public String sayHello(String name) { return "hello " + name + " @";  }
-}
\ No newline at end of file
+}

Copied: felix/trunk/ipojo/examples/tutorial-maven/hello.impl.annotation/src/main/resources/metadata.xml (from r640936, felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.impl.annotation/src/main/resources/metadata.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/tutorial-maven/hello.impl.annotation/src/main/resources/metadata.xml?p2=felix/trunk/ipojo/examples/tutorial-maven/hello.impl.annotation/src/main/resources/metadata.xml&p1=felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.impl.annotation/src/main/resources/metadata.xml&r1=640936&r2=642265&rev=642265&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.impl.annotation/src/main/resources/metadata.xml (original)
+++ felix/trunk/ipojo/examples/tutorial-maven/hello.impl.annotation/src/main/resources/metadata.xml Fri Mar 28 08:33:36 2008
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <iPOJO>
-  <instance component="ipojo.example.hello.impl.HelloImpl" name="HelloService2"/>
+	<instance component="ipojo.example.hello.impl.HelloImpl"
+		name="HelloService2" />
 </iPOJO>

Copied: felix/trunk/ipojo/examples/tutorial-maven/hello.impl/metadata.xml (from r640936, felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.impl/metadata.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/tutorial-maven/hello.impl/metadata.xml?p2=felix/trunk/ipojo/examples/tutorial-maven/hello.impl/metadata.xml&p1=felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.impl/metadata.xml&r1=640936&r2=642265&rev=642265&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.impl/metadata.xml (original)
+++ felix/trunk/ipojo/examples/tutorial-maven/hello.impl/metadata.xml Fri Mar 28 08:33:36 2008
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <iPOJO>
-  <component className="ipojo.example.hello.impl.HelloImpl" name="HelloProvider" architecture="true">
-    <provides/>
-  </component>
-  <instance component="HelloProvider" name="HelloService"/>
+	<component className="ipojo.example.hello.impl.HelloImpl"
+		name="HelloProvider" architecture="true">
+		<provides />
+	</component>
+	<instance component="HelloProvider" name="HelloService" />
 </iPOJO>

Copied: felix/trunk/ipojo/examples/tutorial-maven/hello.impl/pom.xml (from r640936, felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.impl/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/tutorial-maven/hello.impl/pom.xml?p2=felix/trunk/ipojo/examples/tutorial-maven/hello.impl/pom.xml&p1=felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.impl/pom.xml&r1=640936&r2=642265&rev=642265&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.impl/pom.xml (original)
+++ felix/trunk/ipojo/examples/tutorial-maven/hello.impl/pom.xml Fri Mar 28 08:33:36 2008
@@ -1,61 +1,65 @@
 <project>
-  <modelVersion>4.0.0</modelVersion>
-  <packaging>bundle</packaging>
-  <groupId>ipojo.examples</groupId>
-  <artifactId>hello.impl</artifactId>
-  <version>0.7.6-SNAPSHOT</version>
-  <name>Hello Service Provider</name>
-  
-   <pluginRepositories>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>snapshot plugins</name>
-      <url>
-        http://people.apache.org/repo/m2-snapshot-repository
-      </url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </pluginRepository>
-  </pluginRepositories>
-  
-  <dependencies>
-  	<dependency>
-  		<groupId>ipojo.examples</groupId>
-  		<artifactId>hello.service</artifactId>
-  		<version>${pom.version}</version>
-  	</dependency>
-  </dependencies>
-  
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.4.0</version>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-            <Private-Package>ipojo.example.hello.impl</Private-Package> 
-          </instructions>
-        </configuration>
-      </plugin>
-      <plugin>
-	      <groupId>org.apache.felix</groupId>
-	      <artifactId>maven-ipojo-plugin</artifactId>
-	      <version>0.7.6-SNAPSHOT</version>
-		  <executions>
-          	<execution>
-            	<goals>
-	              <goal>ipojo-bundle</goal>
-               </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
+	<modelVersion>4.0.0</modelVersion>
+	<packaging>bundle</packaging>
+	<groupId>ipojo.examples</groupId>
+	<artifactId>hello.impl</artifactId>
+	<version>0.7.6-SNAPSHOT</version>
+	<name>Hello Service Provider</name>
+
+	<pluginRepositories>
+		<pluginRepository>
+			<id>apache.snapshots</id>
+			<name>snapshot plugins</name>
+			<url>
+				http://people.apache.org/repo/m2-snapshot-repository
+			</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+	</pluginRepositories>
+
+	<dependencies>
+		<dependency>
+			<groupId>ipojo.examples</groupId>
+			<artifactId>hello.service</artifactId>
+			<version>${pom.version}</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<version>1.4.0</version>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Bundle-SymbolicName>
+							${pom.artifactId}
+						</Bundle-SymbolicName>
+						<Private-Package>
+							ipojo.example.hello.impl
+						</Private-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-ipojo-plugin</artifactId>
+				<version>0.7.6-SNAPSHOT</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>ipojo-bundle</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 </project>

Copied: felix/trunk/ipojo/examples/tutorial-maven/hello.impl/src/main/java/ipojo/example/hello/impl/HelloImpl.java (from r640936, felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.impl/src/main/java/ipojo/example/hello/impl/HelloImpl.java)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/tutorial-maven/hello.impl/src/main/java/ipojo/example/hello/impl/HelloImpl.java?p2=felix/trunk/ipojo/examples/tutorial-maven/hello.impl/src/main/java/ipojo/example/hello/impl/HelloImpl.java&p1=felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.impl/src/main/java/ipojo/example/hello/impl/HelloImpl.java&r1=640936&r2=642265&rev=642265&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.impl/src/main/java/ipojo/example/hello/impl/HelloImpl.java (original)
+++ felix/trunk/ipojo/examples/tutorial-maven/hello.impl/src/main/java/ipojo/example/hello/impl/HelloImpl.java Fri Mar 28 08:33:36 2008
@@ -22,6 +22,7 @@
 
 /**
  * Component implementing the Hello service.
+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */
 public class HelloImpl implements Hello {
     
@@ -32,4 +33,4 @@
      * @see ipojo.example.hello.Hello#sayHello(java.lang.String)
      */
     public String sayHello(String name) { return "hello " + name;  }
-}
\ No newline at end of file
+}

Propchange: felix/trunk/ipojo/examples/tutorial-maven/hello.service/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 28 08:33:36 2008
@@ -0,0 +1,6 @@
+.classpath
+.project
+.settings
+bin*
+target*
+*.checkstyle

Copied: felix/trunk/ipojo/examples/tutorial-maven/hello.service/pom.xml (from r640936, felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.service/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/tutorial-maven/hello.service/pom.xml?p2=felix/trunk/ipojo/examples/tutorial-maven/hello.service/pom.xml&p1=felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.service/pom.xml&r1=640936&r2=642265&rev=642265&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.service/pom.xml (original)
+++ felix/trunk/ipojo/examples/tutorial-maven/hello.service/pom.xml Fri Mar 28 08:33:36 2008
@@ -1,41 +1,63 @@
+<!--
+	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>
-  <modelVersion>4.0.0</modelVersion>
-  <packaging>bundle</packaging>
-  <groupId>ipojo.examples</groupId>
-  <artifactId>hello.service</artifactId>
-  <version>0.7.6-SNAPSHOT</version>
-  <name>Hello Service</name>
-  
-   <pluginRepositories>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>snapshot plugins</name>
-      <url>
-        http://people.apache.org/repo/m2-snapshot-repository
-      </url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </pluginRepository>
-  </pluginRepositories>
-  
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.4.0</version>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-            <Export-Package>ipojo.example.hello</Export-Package> 
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+	<modelVersion>4.0.0</modelVersion>
+	<packaging>bundle</packaging>
+	<groupId>ipojo.examples</groupId>
+	<artifactId>hello.service</artifactId>
+	<version>0.7.6-SNAPSHOT</version>
+	<name>Hello Service</name>
+
+	<pluginRepositories>
+		<pluginRepository>
+			<id>apache.snapshots</id>
+			<name>snapshot plugins</name>
+			<url>
+				http://people.apache.org/repo/m2-snapshot-repository
+			</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+	</pluginRepositories>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<version>1.4.0</version>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Bundle-SymbolicName>
+							${pom.artifactId}
+						</Bundle-SymbolicName>
+						<Export-Package>
+							ipojo.example.hello
+						</Export-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>

Copied: felix/trunk/ipojo/examples/tutorial-maven/hello.service/src/main/java/ipojo/example/hello/Hello.java (from r640936, felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.service/src/main/java/ipojo/example/hello/Hello.java)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/tutorial-maven/hello.service/src/main/java/ipojo/example/hello/Hello.java?p2=felix/trunk/ipojo/examples/tutorial-maven/hello.service/src/main/java/ipojo/example/hello/Hello.java&p1=felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.service/src/main/java/ipojo/example/hello/Hello.java&r1=640936&r2=642265&rev=642265&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.service/src/main/java/ipojo/example/hello/Hello.java (original)
+++ felix/trunk/ipojo/examples/tutorial-maven/hello.service/src/main/java/ipojo/example/hello/Hello.java Fri Mar 28 08:33:36 2008
@@ -20,13 +20,14 @@
 
 /**
  * Hello Interface.
+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */
 public interface Hello {
 
-/**
- * Returns a message like: "Hello $user_name".
- * @param name the name
- * @return the hello message
- */
-public String sayHello(String name);
-}
\ No newline at end of file
+    /**
+     * Returns a message like: "Hello $user_name".
+     * @param name the name
+     * @return the hello message
+     */
+    String sayHello(String name);
+}

Propchange: felix/trunk/ipojo/extender.pattern.handler/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 28 08:33:36 2008
@@ -0,0 +1,8 @@
+.classpath
+.project
+target*
+bin*
+.checkstyle
+maven-eclipse.xml
+.settings
+.externalToolBuilders

Copied: felix/trunk/ipojo/extender.pattern.handler/metadata.xml (from r640936, felix/sandbox/clement/ipojo/extender.pattern.handler/metadata.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/extender.pattern.handler/metadata.xml?p2=felix/trunk/ipojo/extender.pattern.handler/metadata.xml&p1=felix/sandbox/clement/ipojo/extender.pattern.handler/metadata.xml&r1=640936&r2=642265&rev=642265&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/extender.pattern.handler/metadata.xml (original)
+++ felix/trunk/ipojo/extender.pattern.handler/metadata.xml Fri Mar 28 08:33:36 2008
@@ -1,4 +1,6 @@
 <ipojo>
-<handler classname="org.apache.felix.ipojo.handler.extender.ExtenderModelHandler" name="extender" namespace="org.apache.felix.ipojo.extender">
-</handler>
+	<handler
+		classname="org.apache.felix.ipojo.handler.extender.ExtenderModelHandler"
+		name="extender" namespace="org.apache.felix.ipojo.extender">
+	</handler>
 </ipojo>



Mime
View raw message