commit | 25924e4dba63ab11aeed05b4f08497a105f1fbca | [log] [tgz] |
---|---|---|
author | Alex Karasulu <akarasulu@apache.org> | Wed Jul 26 15:06:44 2006 +0000 |
committer | Alex Karasulu <akarasulu@apache.org> | Wed Jul 26 15:06:44 2006 +0000 |
tree | 2b8322bff7c8621e609bdd614b56f5dc4e2491fd | |
parent | f99924aad1a9f3e1fb05ea9541232576b17e9f4f [diff] |
getting build to work and using examples name instead of tutorials git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@425757 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/tutorials/dictionaryclient/pom.xml b/examples/dictionaryclient/pom.xml similarity index 100% rename from tutorials/dictionaryclient/pom.xml rename to examples/dictionaryclient/pom.xml
diff --git a/tutorials/dictionaryclient/src/main/java/org/apache/felix/examples/dictionaryclient/Activator.java b/examples/dictionaryclient/src/main/java/org/apache/felix/examples/dictionaryclient/Activator.java similarity index 100% rename from tutorials/dictionaryclient/src/main/java/org/apache/felix/examples/dictionaryclient/Activator.java rename to examples/dictionaryclient/src/main/java/org/apache/felix/examples/dictionaryclient/Activator.java
diff --git a/tutorials/dictionaryclient2/pom.xml b/examples/dictionaryclient2/pom.xml similarity index 100% rename from tutorials/dictionaryclient2/pom.xml rename to examples/dictionaryclient2/pom.xml
diff --git a/tutorials/dictionaryclient2/src/main/java/org/apache/felix/examples/dictionaryclient2/Activator.java b/examples/dictionaryclient2/src/main/java/org/apache/felix/examples/dictionaryclient2/Activator.java similarity index 100% rename from tutorials/dictionaryclient2/src/main/java/org/apache/felix/examples/dictionaryclient2/Activator.java rename to examples/dictionaryclient2/src/main/java/org/apache/felix/examples/dictionaryclient2/Activator.java
diff --git a/tutorials/dictionaryservice/pom.xml b/examples/dictionaryservice/pom.xml similarity index 100% rename from tutorials/dictionaryservice/pom.xml rename to examples/dictionaryservice/pom.xml
diff --git a/tutorials/dictionaryservice/src/main/java/org/apache/felix/examples/dictionaryservice/DictionaryService.java b/examples/dictionaryservice/src/main/java/org/apache/felix/examples/dictionaryservice/DictionaryService.java similarity index 100% rename from tutorials/dictionaryservice/src/main/java/org/apache/felix/examples/dictionaryservice/DictionaryService.java rename to examples/dictionaryservice/src/main/java/org/apache/felix/examples/dictionaryservice/DictionaryService.java
diff --git a/tutorials/dictionaryservice/src/main/java/org/apache/felix/examples/dictionaryservice/impl/Activator.java b/examples/dictionaryservice/src/main/java/org/apache/felix/examples/dictionaryservice/impl/Activator.java similarity index 100% rename from tutorials/dictionaryservice/src/main/java/org/apache/felix/examples/dictionaryservice/impl/Activator.java rename to examples/dictionaryservice/src/main/java/org/apache/felix/examples/dictionaryservice/impl/Activator.java
diff --git a/tutorials/eventlistener/pom.xml b/examples/eventlistener/pom.xml similarity index 100% rename from tutorials/eventlistener/pom.xml rename to examples/eventlistener/pom.xml
diff --git a/tutorials/eventlistener/src/main/java/org/apache/felix/examples/eventlistener/Activator.java b/examples/eventlistener/src/main/java/org/apache/felix/examples/eventlistener/Activator.java similarity index 100% rename from tutorials/eventlistener/src/main/java/org/apache/felix/examples/eventlistener/Activator.java rename to examples/eventlistener/src/main/java/org/apache/felix/examples/eventlistener/Activator.java
diff --git a/tutorials/frenchdictionary/pom.xml b/examples/frenchdictionary/pom.xml similarity index 100% rename from tutorials/frenchdictionary/pom.xml rename to examples/frenchdictionary/pom.xml
diff --git a/tutorials/frenchdictionary/src/main/java/org/apache/felix/examples/frenchdictionary/Activator.java b/examples/frenchdictionary/src/main/java/org/apache/felix/examples/frenchdictionary/Activator.java similarity index 100% rename from tutorials/frenchdictionary/src/main/java/org/apache/felix/examples/frenchdictionary/Activator.java rename to examples/frenchdictionary/src/main/java/org/apache/felix/examples/frenchdictionary/Activator.java
diff --git a/examples/pom.xml b/examples/pom.xml new file mode 100644 index 0000000..65e7b82 --- /dev/null +++ b/examples/pom.xml
@@ -0,0 +1,31 @@ +<project> + <parent> + <groupId>org.apache.felix</groupId> + <artifactId>felix</artifactId> + <version>0.8.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <packaging>pom</packaging> + <name>Apache Felix Examples: Build</name> + <artifactId>build</artifactId> + + <modules> + <module>eventlistener</module> + <module>dictionaryservice</module> + <module>frenchdictionary</module> + <module>dictionaryclient</module> + <module>dictionaryclient2</module> + <module>spellcheckservice</module> + <module>spellcheckclient</module> + <module>spellcheckbinder</module> + </modules> + + <dependencies> + <dependency> + <groupId>${pom.groupId}</groupId> + <artifactId>org.osgi.core</artifactId> + <version>${pom.version}</version> + <scope>provided</scope> + </dependency> + </dependencies> +</project>
diff --git a/tutorials/spellcheckbinder/pom.xml b/examples/spellcheckbinder/pom.xml similarity index 100% rename from tutorials/spellcheckbinder/pom.xml rename to examples/spellcheckbinder/pom.xml
diff --git a/tutorials/spellcheckbinder/src/main/java/org/apache/felix/examples/spellcheckbinder/Activator.java b/examples/spellcheckbinder/src/main/java/org/apache/felix/examples/spellcheckbinder/Activator.java similarity index 100% rename from tutorials/spellcheckbinder/src/main/java/org/apache/felix/examples/spellcheckbinder/Activator.java rename to examples/spellcheckbinder/src/main/java/org/apache/felix/examples/spellcheckbinder/Activator.java
diff --git a/tutorials/spellcheckbinder/src/main/java/org/apache/felix/examples/spellcheckbinder/SpellCheckServiceImpl.java b/examples/spellcheckbinder/src/main/java/org/apache/felix/examples/spellcheckbinder/SpellCheckServiceImpl.java similarity index 100% rename from tutorials/spellcheckbinder/src/main/java/org/apache/felix/examples/spellcheckbinder/SpellCheckServiceImpl.java rename to examples/spellcheckbinder/src/main/java/org/apache/felix/examples/spellcheckbinder/SpellCheckServiceImpl.java
diff --git a/tutorials/spellcheckbinder/src/main/resources/metadata.xml b/examples/spellcheckbinder/src/main/resources/metadata.xml similarity index 100% rename from tutorials/spellcheckbinder/src/main/resources/metadata.xml rename to examples/spellcheckbinder/src/main/resources/metadata.xml
diff --git a/tutorials/spellcheckclient/pom.xml b/examples/spellcheckclient/pom.xml similarity index 100% rename from tutorials/spellcheckclient/pom.xml rename to examples/spellcheckclient/pom.xml
diff --git a/tutorials/spellcheckclient/src/main/java/org/apache/felix/examples/spellcheckclient/Activator.java b/examples/spellcheckclient/src/main/java/org/apache/felix/examples/spellcheckclient/Activator.java similarity index 100% rename from tutorials/spellcheckclient/src/main/java/org/apache/felix/examples/spellcheckclient/Activator.java rename to examples/spellcheckclient/src/main/java/org/apache/felix/examples/spellcheckclient/Activator.java
diff --git a/tutorials/spellcheckservice/pom.xml b/examples/spellcheckservice/pom.xml similarity index 100% rename from tutorials/spellcheckservice/pom.xml rename to examples/spellcheckservice/pom.xml
diff --git a/tutorials/spellcheckservice/src/main/java/org/apache/felix/examples/spellcheckservice/SpellCheckService.java b/examples/spellcheckservice/src/main/java/org/apache/felix/examples/spellcheckservice/SpellCheckService.java similarity index 100% rename from tutorials/spellcheckservice/src/main/java/org/apache/felix/examples/spellcheckservice/SpellCheckService.java rename to examples/spellcheckservice/src/main/java/org/apache/felix/examples/spellcheckservice/SpellCheckService.java
diff --git a/tutorials/spellcheckservice/src/main/java/org/apache/felix/examples/spellcheckservice/impl/Activator.java b/examples/spellcheckservice/src/main/java/org/apache/felix/examples/spellcheckservice/impl/Activator.java similarity index 100% rename from tutorials/spellcheckservice/src/main/java/org/apache/felix/examples/spellcheckservice/impl/Activator.java rename to examples/spellcheckservice/src/main/java/org/apache/felix/examples/spellcheckservice/impl/Activator.java
diff --git a/pom.xml b/pom.xml index 5953c82..d0ff19d 100644 --- a/pom.xml +++ b/pom.xml
@@ -20,16 +20,9 @@ <module>org.apache.felix.daemon</module> <module>org.apache.felix.dependencymanager</module> <module>org.apache.felix.main</module> -<!-- prep to reorg examles into tutorials section - <module>org.apache.felix.examples.eventlistener</module> - <module>org.apache.felix.examples.dictionaryservice</module> - <module>org.apache.felix.examples.frenchdictionary</module> - <module>org.apache.felix.examples.dictionaryclient</module> - <module>org.apache.felix.examples.dictionaryclient2</module> - <module>org.apache.felix.examples.spellcheckservice</module> - <module>org.apache.felix.examples.spellcheckclient</module> - <module>org.apache.felix.examples.spellcheckbinder</module> ---> + + <module>examples</module> + <module>org.apache.felix.servicebinder</module> <module>org.apache.felix.wireadmin</module> <module>org.apache.felix.upnp.extra</module>