Author: clement
Date: Fri May 16 10:41:30 2008
New Revision: 657146
URL: http://svn.apache.org/viewvc?rev=657146&view=rev
Log:
Update the code style.
Removed:
felix/sandbox/clement/temporal/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/annotations/
Modified:
felix/sandbox/clement/temporal/tests.temporal.dependency/pom.xml
felix/sandbox/clement/temporal/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/component/CheckServiceProvider.java
felix/sandbox/clement/temporal/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/component/FooProvider.java
felix/sandbox/clement/temporal/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/component/MultipleCheckServiceProvider.java
felix/sandbox/clement/temporal/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/temporal/DelayTest.java
felix/sandbox/clement/temporal/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/temporal/DelayedProvider.java
felix/sandbox/clement/temporal/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/temporal/NoDelayTest.java
felix/sandbox/clement/temporal/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
Modified: felix/sandbox/clement/temporal/tests.temporal.dependency/pom.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/temporal/tests.temporal.dependency/pom.xml?rev=657146&r1=657145&r2=657146&view=diff
==============================================================================
--- felix/sandbox/clement/temporal/tests.temporal.dependency/pom.xml (original)
+++ felix/sandbox/clement/temporal/tests.temporal.dependency/pom.xml Fri May 16
10:41:30 2008
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>iPOJO Temporal Dependency Test Suite</name>
- <artifactId>tests.core.annotations</artifactId>
+ <artifactId>tests.temporal.dependency</artifactId>
<groupId>ipojo.tests</groupId>
<version>0.8.0-SNAPSHOT</version>
<dependencies>
@@ -55,14 +55,6 @@
<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>
Modified:
felix/sandbox/clement/temporal/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/component/CheckServiceProvider.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/temporal/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/component/CheckServiceProvider.java?rev=657146&r1=657145&r2=657146&view=diff
==============================================================================
---
felix/sandbox/clement/temporal/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/component/CheckServiceProvider.java
(original)
+++
felix/sandbox/clement/temporal/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/component/CheckServiceProvider.java
Fri May 16 10:41:30 2008
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.felix.ipojo.test.scenarios.component;
import java.util.Properties;
Modified:
felix/sandbox/clement/temporal/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/component/FooProvider.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/temporal/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/component/FooProvider.java?rev=657146&r1=657145&r2=657146&view=diff
==============================================================================
---
felix/sandbox/clement/temporal/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/component/FooProvider.java
(original)
+++
felix/sandbox/clement/temporal/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/component/FooProvider.java
Fri May 16 10:41:30 2008
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.felix.ipojo.test.scenarios.component;
import java.util.Properties;
Modified:
felix/sandbox/clement/temporal/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/component/MultipleCheckServiceProvider.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/temporal/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/component/MultipleCheckServiceProvider.java?rev=657146&r1=657145&r2=657146&view=diff
==============================================================================
---
felix/sandbox/clement/temporal/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/component/MultipleCheckServiceProvider.java
(original)
+++
felix/sandbox/clement/temporal/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/component/MultipleCheckServiceProvider.java
Fri May 16 10:41:30 2008
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.felix.ipojo.test.scenarios.component;
import java.util.Properties;
Modified:
felix/sandbox/clement/temporal/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/temporal/DelayTest.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/temporal/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/temporal/DelayTest.java?rev=657146&r1=657145&r2=657146&view=diff
==============================================================================
---
felix/sandbox/clement/temporal/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/temporal/DelayTest.java
(original)
+++
felix/sandbox/clement/temporal/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/temporal/DelayTest.java
Fri May 16 10:41:30 2008
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.felix.ipojo.test.scenarios.temporal;
import org.apache.felix.ipojo.ComponentInstance;
Modified:
felix/sandbox/clement/temporal/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/temporal/DelayedProvider.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/temporal/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/temporal/DelayedProvider.java?rev=657146&r1=657145&r2=657146&view=diff
==============================================================================
---
felix/sandbox/clement/temporal/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/temporal/DelayedProvider.java
(original)
+++
felix/sandbox/clement/temporal/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/temporal/DelayedProvider.java
Fri May 16 10:41:30 2008
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.felix.ipojo.test.scenarios.temporal;
import org.apache.felix.ipojo.ComponentInstance;
Modified:
felix/sandbox/clement/temporal/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/temporal/NoDelayTest.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/temporal/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/temporal/NoDelayTest.java?rev=657146&r1=657145&r2=657146&view=diff
==============================================================================
---
felix/sandbox/clement/temporal/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/temporal/NoDelayTest.java
(original)
+++
felix/sandbox/clement/temporal/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/temporal/NoDelayTest.java
Fri May 16 10:41:30 2008
@@ -1,8 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.felix.ipojo.test.scenarios.temporal;
import org.apache.felix.ipojo.ComponentInstance;
import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
-import org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider;
import org.apache.felix.ipojo.test.scenarios.temporal.service.CheckService;
import org.apache.felix.ipojo.test.scenarios.temporal.service.FooService;
import org.apache.felix.ipojo.test.scenarios.util.Utils;
Modified:
felix/sandbox/clement/temporal/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/temporal/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java?rev=657146&r1=657145&r2=657146&view=diff
==============================================================================
---
felix/sandbox/clement/temporal/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
(original)
+++
felix/sandbox/clement/temporal/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
Fri May 16 10:41:30 2008
@@ -28,6 +28,7 @@
import org.apache.felix.ipojo.Handler;
import org.apache.felix.ipojo.HandlerFactory;
import org.apache.felix.ipojo.ServiceContext;
+import org.apache.felix.ipojo.metadata.Element;
import org.apache.felix.ipojo.parser.ManifestMetadataParser;
import org.apache.felix.ipojo.parser.ParseException;
import org.osgi.framework.BundleContext;
@@ -35,8 +36,6 @@
import org.osgi.framework.ServiceReference;
import org.osgi.service.cm.ManagedServiceFactory;
-import org.apache.felix.ipojo.metadata.Element;
-
public class Utils {
public static Element getMetatadata(BundleContext bc, String component) {
