diff options
| author | Mat Booth | 2016-06-09 18:43:39 +0000 |
|---|---|---|
| committer | Mat Booth | 2016-09-13 16:04:04 +0000 |
| commit | c79dfa48cfcd72a0d4c76220c5f96ac5eb037239 (patch) | |
| tree | 2c4be70155b87b71947376fe56a94d37b55e9c6c | |
| parent | 2f4b1f4c3b3c8b921b3faf4ef9a15785cbcc6b34 (diff) | |
| download | org.eclipse.ecf-c79dfa48cfcd72a0d4c76220c5f96ac5eb037239.tar.gz org.eclipse.ecf-c79dfa48cfcd72a0d4c76220c5f96ac5eb037239.tar.xz org.eclipse.ecf-c79dfa48cfcd72a0d4c76220c5f96ac5eb037239.zip | |
Bug 396457 - [Releng][Maven] Create a build based on tycho
Second part of adding the necessary machinery to build ECF with
tycho -- it now builds the whole SDK. The resulting p2 site
should now contain the same bundles as the p2 site generated by
buckminster.
Due to the target platform needing APIs available only in Java 1.4,
some bundles have had their compilation profiles bumped up from
Java 1.3. In these cases the BREE remains unchanged.
In order to preserve compatibility with the Java 1.5 BREE specified
in the jive smack library, some @Override annotations were removed.
Change-Id: I7b6acce0ef1204d0ad0146218694c8722c3dbcd8
Signed-off-by: Mat Booth <mat.booth@redhat.com>
103 files changed, 1382 insertions, 579 deletions
diff --git a/doc/bundles/org.eclipse.ecf.doc/META-INF/MANIFEST.MF b/doc/bundles/org.eclipse.ecf.doc/META-INF/MANIFEST.MF index a7d187aac..f86b8d656 100644 --- a/doc/bundles/org.eclipse.ecf.doc/META-INF/MANIFEST.MF +++ b/doc/bundles/org.eclipse.ecf.doc/META-INF/MANIFEST.MF @@ -10,6 +10,6 @@ Require-Bundle: org.eclipse.help, org.eclipse.ui.intro.universal, org.eclipse.ui Eclipse-LazyStart: true -Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, - J2SE-1.4 +Bundle-RequiredExecutionEnvironment: J2SE-1.4, + CDC-1.1/Foundation-1.1 Bundle-ActivationPolicy: lazy diff --git a/doc/bundles/org.eclipse.ecf.doc/pom.xml b/doc/bundles/org.eclipse.ecf.doc/pom.xml new file mode 100644 index 000000000..2ba5decd9 --- /dev/null +++ b/doc/bundles/org.eclipse.ecf.doc/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.doc</artifactId> + <version>1.3.100-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/pom.xml b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/pom.xml new file mode 100644 index 000000000..d1ad65a31 --- /dev/null +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>com.mycorp.examples.timeservice.consumer.ds</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rest/pom.xml b/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rest/pom.xml new file mode 100644 index 000000000..bb36c6a7f --- /dev/null +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rest/pom.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <artifactId>com.mycorp.examples.timeservice.consumer.filediscovery.rest</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> + + <build> + <plugins> + <plugin> + <!-- p2 cannot handle provide/require-capability yet, see ebz#313553 --> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tycho-version}</version> + <configuration> + <dependency-resolution> + <extraRequirements> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.ecf.osgi.services.remoteserviceadmin</id> + <versionRange>0.0.0</versionRange> + </requirement> + </extraRequirements> + </dependency-resolution> + </configuration> + </plugin> + </plugins> + </build> +</project> + diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery/pom.xml b/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery/pom.xml new file mode 100644 index 000000000..679589f97 --- /dev/null +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery/pom.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <artifactId>com.mycorp.examples.timeservice.consumer.filediscovery</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> + + <build> + <plugins> + <plugin> + <!-- p2 cannot handle provide/require-capability yet, see ebz#313553 --> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tycho-version}</version> + <configuration> + <dependency-resolution> + <extraRequirements> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.ecf.osgi.services.remoteserviceadmin</id> + <versionRange>0.0.0</versionRange> + </requirement> + </extraRequirements> + </dependency-resolution> + </configuration> + </plugin> + </plugins> + </build> +</project> + diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer/pom.xml b/examples/bundles/com.mycorp.examples.timeservice.consumer/pom.xml new file mode 100644 index 000000000..0e5f0ce9c --- /dev/null +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>com.mycorp.examples.timeservice.consumer</artifactId> + <version>1.1.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/pom.xml b/examples/bundles/com.mycorp.examples.timeservice.host/pom.xml new file mode 100644 index 000000000..0571a5fdd --- /dev/null +++ b/examples/bundles/com.mycorp.examples.timeservice.host/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>com.mycorp.examples.timeservice.host</artifactId> + <version>1.1.100-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/examples/bundles/com.mycorp.examples.timeservice.provider.rest.consumer/pom.xml b/examples/bundles/com.mycorp.examples.timeservice.provider.rest.consumer/pom.xml new file mode 100644 index 000000000..023cb3094 --- /dev/null +++ b/examples/bundles/com.mycorp.examples.timeservice.provider.rest.consumer/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>com.mycorp.examples.timeservice.provider.rest.consumer</artifactId> + <version>1.1.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/examples/bundles/com.mycorp.examples.timeservice.provider.rest.host/pom.xml b/examples/bundles/com.mycorp.examples.timeservice.provider.rest.host/pom.xml new file mode 100644 index 000000000..4c7280778 --- /dev/null +++ b/examples/bundles/com.mycorp.examples.timeservice.provider.rest.host/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>com.mycorp.examples.timeservice.provider.rest.host</artifactId> + <version>1.1.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/examples/bundles/com.mycorp.examples.timeservice/pom.xml b/examples/bundles/com.mycorp.examples.timeservice/pom.xml new file mode 100644 index 000000000..ab9255d35 --- /dev/null +++ b/examples/bundles/com.mycorp.examples.timeservice/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>com.mycorp.examples.timeservice</artifactId> + <version>1.1.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/examples/bundles/org.eclipse.ecf.example.clients/pom.xml b/examples/bundles/org.eclipse.ecf.example.clients/pom.xml new file mode 100644 index 000000000..a5043e31d --- /dev/null +++ b/examples/bundles/org.eclipse.ecf.example.clients/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.example.clients</artifactId> + <version>2.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/examples/bundles/org.eclipse.ecf.example.collab.editor/pom.xml b/examples/bundles/org.eclipse.ecf.example.collab.editor/pom.xml new file mode 100644 index 000000000..6be387437 --- /dev/null +++ b/examples/bundles/org.eclipse.ecf.example.collab.editor/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.example.collab.editor</artifactId> + <version>1.0.200-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/examples/bundles/org.eclipse.ecf.example.collab/pom.xml b/examples/bundles/org.eclipse.ecf.example.collab/pom.xml new file mode 100644 index 000000000..094a4330d --- /dev/null +++ b/examples/bundles/org.eclipse.ecf.example.collab/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.example.collab</artifactId> + <version>2.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/pom.xml b/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/pom.xml new file mode 100644 index 000000000..e0fe5e97b --- /dev/null +++ b/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.examples.eventadmin.app</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.edef/pom.xml b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.edef/pom.xml new file mode 100644 index 000000000..71757e480 --- /dev/null +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.edef/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.examples.remoteservices.hello.consumer.edef</artifactId> + <version>1.1.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/pom.xml b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/pom.xml new file mode 100644 index 000000000..e4365fe5a --- /dev/null +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.examples.remoteservices.hello.consumer</artifactId> + <version>3.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.consumer/pom.xml b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.consumer/pom.xml new file mode 100644 index 000000000..edbb07627 --- /dev/null +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.consumer/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.examples.remoteservices.hello.ds.consumer</artifactId> + <version>2.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/pom.xml b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/pom.xml new file mode 100644 index 000000000..c019bd3eb --- /dev/null +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.examples.remoteservices.hello.host</artifactId> + <version>3.1.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello/pom.xml b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello/pom.xml new file mode 100644 index 000000000..9e11512e0 --- /dev/null +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.examples.remoteservices.hello</artifactId> + <version>4.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.rest.rss/pom.xml b/examples/bundles/org.eclipse.ecf.examples.remoteservices.rest.rss/pom.xml new file mode 100644 index 000000000..d3d23fa23 --- /dev/null +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.rest.rss/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.examples.remoteservices.rest.rss</artifactId> + <version>1.1.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.browser/pom.xml b/framework/bundles/org.eclipse.ecf.discovery.ui.browser/pom.xml new file mode 100644 index 000000000..07fef4eda --- /dev/null +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.browser/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.discovery.ui.browser</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.edit/pom.xml b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/pom.xml new file mode 100644 index 000000000..507d110f2 --- /dev/null +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.discovery.ui.edit</artifactId> + <version>3.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.model/pom.xml b/framework/bundles/org.eclipse.ecf.discovery.ui.model/pom.xml new file mode 100644 index 000000000..fb1951b4d --- /dev/null +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.model/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.discovery.ui.model</artifactId> + <version>3.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/pom.xml b/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/pom.xml new file mode 100644 index 000000000..a4f49c23d --- /dev/null +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.discovery.ui.properties.tabbed</artifactId> + <version>3.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.properties/pom.xml b/framework/bundles/org.eclipse.ecf.discovery.ui.properties/pom.xml new file mode 100644 index 000000000..c1ed165b8 --- /dev/null +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.properties/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.discovery.ui.properties</artifactId> + <version>3.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/pom.xml b/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/pom.xml new file mode 100644 index 000000000..17234fb28 --- /dev/null +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.discovery.ui.userinput</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui/pom.xml b/framework/bundles/org.eclipse.ecf.discovery.ui/pom.xml new file mode 100644 index 000000000..af1cb4d5c --- /dev/null +++ b/framework/bundles/org.eclipse.ecf.discovery.ui/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.discovery.ui</artifactId> + <version>3.0.100-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/framework/bundles/org.eclipse.ecf.filetransfer.ui/pom.xml b/framework/bundles/org.eclipse.ecf.filetransfer.ui/pom.xml new file mode 100644 index 000000000..b074119c5 --- /dev/null +++ b/framework/bundles/org.eclipse.ecf.filetransfer.ui/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.filetransfer.ui</artifactId> + <version>1.5.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/framework/bundles/org.eclipse.ecf.presence.bot/pom.xml b/framework/bundles/org.eclipse.ecf.presence.bot/pom.xml new file mode 100644 index 000000000..35d5c54a3 --- /dev/null +++ b/framework/bundles/org.eclipse.ecf.presence.bot/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.presence.bot</artifactId> + <version>1.3.100-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/pom.xml b/framework/bundles/org.eclipse.ecf.presence.collab.ui/pom.xml new file mode 100644 index 000000000..8a6f9aa50 --- /dev/null +++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.presence.collab.ui</artifactId> + <version>1.3.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest.synd/pom.xml b/framework/bundles/org.eclipse.ecf.remoteservice.rest.synd/pom.xml new file mode 100644 index 000000000..48ea54dfe --- /dev/null +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest.synd/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.remoteservice.rest.synd</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest/pom.xml b/framework/bundles/org.eclipse.ecf.remoteservice.rest/pom.xml new file mode 100644 index 000000000..8639a604a --- /dev/null +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.remoteservice.rest</artifactId> + <version>2.7.100-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.servlet/pom.xml b/framework/bundles/org.eclipse.ecf.remoteservice.servlet/pom.xml new file mode 100644 index 000000000..1178648d3 --- /dev/null +++ b/framework/bundles/org.eclipse.ecf.remoteservice.servlet/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.remoteservice.servlet</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.soap/pom.xml b/framework/bundles/org.eclipse.ecf.remoteservice.soap/pom.xml new file mode 100644 index 000000000..af27d9a4d --- /dev/null +++ b/framework/bundles/org.eclipse.ecf.remoteservice.soap/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.remoteservice.soap</artifactId> + <version>1.1.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/pom.xml b/framework/bundles/org.eclipse.ecf.remoteservice.ui/pom.xml new file mode 100644 index 000000000..d4a2009d4 --- /dev/null +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.remoteservice.ui</artifactId> + <version>3.4.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/framework/bundles/org.eclipse.ecf.storage/pom.xml b/framework/bundles/org.eclipse.ecf.storage/pom.xml new file mode 100644 index 000000000..21b33c7c0 --- /dev/null +++ b/framework/bundles/org.eclipse.ecf.storage/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.storage</artifactId> + <version>2.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/framework/bundles/org.eclipse.ecf.telephony.call.ui/build.properties b/framework/bundles/org.eclipse.ecf.telephony.call.ui/build.properties index e096bc66c..7acca17d0 100644 --- a/framework/bundles/org.eclipse.ecf.telephony.call.ui/build.properties +++ b/framework/bundles/org.eclipse.ecf.telephony.call.ui/build.properties @@ -5,5 +5,5 @@ bin.includes = META-INF/,\ about.html,\ plugin.properties src.includes = about.html -jre.compilation.profile = J2SE-1.3 +jre.compilation.profile = J2SE-1.4 javacWarnings.. = -assertIdentifier,-enumIdentifier diff --git a/framework/bundles/org.eclipse.ecf.telephony.call.ui/pom.xml b/framework/bundles/org.eclipse.ecf.telephony.call.ui/pom.xml new file mode 100644 index 000000000..6a1086001 --- /dev/null +++ b/framework/bundles/org.eclipse.ecf.telephony.call.ui/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.telephony.call.ui</artifactId> + <version>1.3.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/framework/bundles/org.eclipse.ecf.telephony.call/build.properties b/framework/bundles/org.eclipse.ecf.telephony.call/build.properties index bc24e63d5..7eb9a2746 100644 --- a/framework/bundles/org.eclipse.ecf.telephony.call/build.properties +++ b/framework/bundles/org.eclipse.ecf.telephony.call/build.properties @@ -15,5 +15,5 @@ bin.includes = .,\ src.includes = about.html source.. = src/ output.. = bin/ -jre.compilation.profile = J2SE-1.3 +jre.compilation.profile = J2SE-1.4 javacWarnings.. = -assertIdentifier,-enumIdentifier diff --git a/framework/bundles/org.eclipse.ecf.telephony.call/pom.xml b/framework/bundles/org.eclipse.ecf.telephony.call/pom.xml new file mode 100644 index 000000000..63d3ae2f8 --- /dev/null +++ b/framework/bundles/org.eclipse.ecf.telephony.call/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.telephony.call</artifactId> + <version>2.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/framework/bundles/org.eclipse.ecf.ui.capabilities/build.properties b/framework/bundles/org.eclipse.ecf.ui.capabilities/build.properties index 506248f2e..7872d161c 100644 --- a/framework/bundles/org.eclipse.ecf.ui.capabilities/build.properties +++ b/framework/bundles/org.eclipse.ecf.ui.capabilities/build.properties @@ -3,6 +3,6 @@ bin.includes = META-INF/,\ plugin.xml,\ plugin.properties,\ about.html -jre.compilation.profile = J2SE-1.3 +jre.compilation.profile = J2SE-1.4 javacWarnings.. = -assertIdentifier,-enumIdentifier src.includes = about.html diff --git a/framework/bundles/org.eclipse.ecf.ui.capabilities/pom.xml b/framework/bundles/org.eclipse.ecf.ui.capabilities/pom.xml new file mode 100644 index 000000000..d44a43946 --- /dev/null +++ b/framework/bundles/org.eclipse.ecf.ui.capabilities/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.ui.capabilities</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/framework/bundles/org.eclipse.team.ecf.core/pom.xml b/framework/bundles/org.eclipse.team.ecf.core/pom.xml new file mode 100644 index 000000000..2300e8e77 --- /dev/null +++ b/framework/bundles/org.eclipse.team.ecf.core/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.team.ecf.core</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/framework/bundles/org.eclipse.team.ecf.ui/pom.xml b/framework/bundles/org.eclipse.team.ecf.ui/pom.xml new file mode 100644 index 000000000..0d4f4b6dd --- /dev/null +++ b/framework/bundles/org.eclipse.team.ecf.ui/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.team.ecf.ui</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> @@ -63,59 +63,144 @@ </pluginRepositories> <modules> - <module>framework/bundles/org.eclipse.ecf</module> - <module>framework/bundles/org.eclipse.ecf.filetransfer</module> - <module>framework/bundles/org.eclipse.ecf.identity</module> - <module>framework/bundles/org.eclipse.ecf.ssl</module> - <module>framework/bundles/org.eclipse.ecf.discovery</module> - <module>framework/bundles/org.eclipse.ecf.sharedobject</module> - <module>framework/bundles/org.eclipse.ecf.provider</module> + <module>doc/bundles/org.eclipse.ecf.doc</module> + + <module>examples/bundles/com.mycorp.examples.timeservice</module> + <module>examples/bundles/com.mycorp.examples.timeservice.consumer</module> + <module>examples/bundles/com.mycorp.examples.timeservice.consumer.ds</module> + <module>examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery</module> + <module>examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rest</module> + <module>examples/bundles/com.mycorp.examples.timeservice.host</module> + <module>examples/bundles/com.mycorp.examples.timeservice.provider.rest.consumer</module> + <module>examples/bundles/com.mycorp.examples.timeservice.provider.rest.host</module> + <module>examples/bundles/org.eclipse.ecf.example.clients</module> + <module>examples/bundles/org.eclipse.ecf.example.collab.editor</module> + <module>examples/bundles/org.eclipse.ecf.example.collab</module> + <module>examples/bundles/org.eclipse.ecf.examples.eventadmin.app</module> + <module>examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.edef</module> + <module>examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer</module> + <module>examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.consumer</module> + <module>examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host</module> + <module>examples/bundles/org.eclipse.ecf.examples.remoteservices.hello</module> + <module>examples/bundles/org.eclipse.ecf.examples.remoteservices.rest.rss</module> + + <module>framework/bundles/org.eclipse.ecf.console</module> <module>framework/bundles/org.eclipse.ecf.datashare</module> + <module>framework/bundles/org.eclipse.ecf.discovery</module> + <module>framework/bundles/org.eclipse.ecf.discovery.ui.browser</module> + <module>framework/bundles/org.eclipse.ecf.discovery.ui.edit</module> + <module>framework/bundles/org.eclipse.ecf.discovery.ui.model</module> + <module>framework/bundles/org.eclipse.ecf.discovery.ui</module> + <module>framework/bundles/org.eclipse.ecf.discovery.ui.properties</module> + <module>framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed</module> + <module>framework/bundles/org.eclipse.ecf.discovery.ui.userinput</module> <module>framework/bundles/org.eclipse.ecf.docshare</module> - <module>framework/bundles/org.eclipse.ecf.sync</module> - <module>framework/bundles/org.eclipse.ecf.ui</module> + <module>framework/bundles/org.eclipse.ecf.filetransfer</module> + <module>framework/bundles/org.eclipse.ecf.filetransfer.ui</module> + <module>framework/bundles/org.eclipse.ecf.identity</module> + <module>framework/bundles/org.eclipse.ecf</module> + <module>framework/bundles/org.eclipse.ecf.presence.bot</module> + <module>framework/bundles/org.eclipse.ecf.presence.collab.ui</module> <module>framework/bundles/org.eclipse.ecf.presence</module> <module>framework/bundles/org.eclipse.ecf.presence.ui</module> - <module>framework/bundles/org.eclipse.ecf.console</module> - <module>framework/bundles/org.eclipse.ecf.remoteservice</module> + <module>framework/bundles/org.eclipse.ecf.provider</module> <module>framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy</module> <module>framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8</module> + <module>framework/bundles/org.eclipse.ecf.remoteservice</module> + <module>framework/bundles/org.eclipse.ecf.remoteservice.rest</module> + <module>framework/bundles/org.eclipse.ecf.remoteservice.rest.synd</module> + <module>framework/bundles/org.eclipse.ecf.remoteservice.servlet</module> + <module>framework/bundles/org.eclipse.ecf.remoteservice.soap</module> + <module>framework/bundles/org.eclipse.ecf.remoteservice.ui</module> + <module>framework/bundles/org.eclipse.ecf.sharedobject</module> + <module>framework/bundles/org.eclipse.ecf.ssl</module> + <module>framework/bundles/org.eclipse.ecf.storage</module> + <module>framework/bundles/org.eclipse.ecf.sync</module> + <module>framework/bundles/org.eclipse.ecf.telephony.call</module> + <module>framework/bundles/org.eclipse.ecf.telephony.call.ui</module> + <module>framework/bundles/org.eclipse.ecf.ui.capabilities</module> + <module>framework/bundles/org.eclipse.ecf.ui</module> + <module>framework/bundles/org.eclipse.team.ecf.core</module> + <module>framework/bundles/org.eclipse.team.ecf.ui</module> - <module>providers/bundles/org.eclipse.ecf.provider.filetransfer</module> + <module>osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin</module> + <module>osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy</module> + <module>osgi/bundles/org.eclipse.osgi.services.remoteserviceadmin</module> + <module>compendium/bundles/org.eclipse.ecf.osgi.services.distribution</module> + + <module>protocols/bundles/ch.ethz.iks.r_osgi.remote</module> + <module>protocols/bundles/ch.ethz.iks.slp</module> + <module>protocols/bundles/org.eclipse.ecf.protocol.bittorrent</module> + <module>protocols/bundles/org.eclipse.ecf.protocol.msn</module> + <module>protocols/bundles/org.jivesoftware.smack</module> + + <module>providers/bundles/org.eclipse.ecf.provider.bittorrent</module> + <module>providers/bundles/org.eclipse.ecf.provider.bittorrent.ui</module> + <module>providers/bundles/org.eclipse.ecf.provider.datashare</module> + <module>providers/bundles/org.eclipse.ecf.provider.datashare.nio</module> + <module>providers/bundles/org.eclipse.ecf.provider.discovery</module> + <module>providers/bundles/org.eclipse.ecf.provider.dnssd</module> + <module>providers/bundles/org.eclipse.ecf.provider.filetransfer.efs</module> <module>providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4</module> <module>providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4.ssl</module> + <module>providers/bundles/org.eclipse.ecf.provider.filetransfer</module> + <module>providers/bundles/org.eclipse.ecf.provider.filetransfer.scp</module> <module>providers/bundles/org.eclipse.ecf.provider.filetransfer.ssl</module> - <module>providers/bundles/org.eclipse.ecf.provider.discovery</module> - <module>providers/bundles/org.eclipse.ecf.provider.dnssd</module> + <module>providers/bundles/org.eclipse.ecf.provider.irc</module> + <module>providers/bundles/org.eclipse.ecf.provider.irc.ui</module> <module>providers/bundles/org.eclipse.ecf.provider.jmdns</module> + <module>providers/bundles/org.eclipse.ecf.provider.jslp</module> + <module>providers/bundles/org.eclipse.ecf.provider.msn</module> + <module>providers/bundles/org.eclipse.ecf.provider.msn.ui</module> + <module>providers/bundles/org.eclipse.ecf.provider.remoteservice</module> + <module>providers/bundles/org.eclipse.ecf.provider.r_osgi</module> + <module>providers/bundles/org.eclipse.ecf.provider.ui</module> + <module>providers/bundles/org.eclipse.ecf.provider.xmpp.datashare</module> + <module>providers/bundles/org.eclipse.ecf.provider.xmpp</module> + <module>providers/bundles/org.eclipse.ecf.provider.xmpp.remoteservice</module> + <module>providers/bundles/org.eclipse.ecf.provider.xmpp.ui</module> <module>providers/bundles/org.eclipse.ecf.provider.zookeeper</module> - <module>providers/bundles/org.eclipse.ecf.provider.datashare</module> - <module>providers/bundles/org.eclipse.ecf.provider.datashare.nio</module> - <module>osgi/bundles/org.eclipse.osgi.services.remoteserviceadmin</module> - <module>osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy</module> - <module>osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin</module> - <module>compendium/bundles/org.eclipse.ecf.osgi.services.distribution</module> + <module>server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin</module> + <module>server-side/bundles/org.eclipse.ecf.server.generic</module> + <module>server-side/bundles/org.eclipse.ecf.server</module> + <module>server-side/features/org.eclipse.ecf.server.generic.feature</module> + + <module>tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde</module> + <module>releng/features/org.eclipse.ecf.console.feature</module> + <module>releng/features/org.eclipse.ecf.core</module> <module>releng/features/org.eclipse.ecf.core.feature</module> <module>releng/features/org.eclipse.ecf.core.ssl.feature</module> - <module>releng/features/org.eclipse.ecf.filetransfer.feature</module> - <module>releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature</module> - <module>releng/features/org.eclipse.ecf.filetransfer.httpclient4.ssl.feature</module> - <module>releng/features/org.eclipse.ecf.filetransfer.ssl.feature</module> - <module>releng/features/org.eclipse.ecf.discovery.feature</module> + <module>releng/features/org.eclipse.ecf.datashare.feature</module> <module>releng/features/org.eclipse.ecf.discovery.dnssd.feature</module> + <module>releng/features/org.eclipse.ecf.discovery.feature</module> <module>releng/features/org.eclipse.ecf.discovery.jmdns.feature</module> + <module>releng/features/org.eclipse.ecf.discovery.slp.feature</module> <module>releng/features/org.eclipse.ecf.discovery.zookeeper.feature</module> - <module>releng/features/org.eclipse.ecf.sharedobject.feature</module> - <module>releng/features/org.eclipse.ecf.provider.generic.feature</module> <module>releng/features/org.eclipse.ecf.docshare.feature</module> - <module>releng/features/org.eclipse.ecf.datashare.feature</module> + <module>releng/features/org.eclipse.ecf.eventadmin.examples.feature</module> + <module>releng/features/org.eclipse.ecf.eventadmin.feature</module> + <module>releng/features/org.eclipse.ecf.filetransfer.feature</module> + <module>releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature</module> + <module>releng/features/org.eclipse.ecf.filetransfer.httpclient4.ssl.feature</module> + <module>releng/features/org.eclipse.ecf.filetransfer.ssl.feature</module> + <module>releng/features/org.eclipse.ecf.osgi.services.feature</module> <module>releng/features/org.eclipse.ecf.presence.feature</module> - <module>releng/features/org.eclipse.ecf.console.feature</module> <module>releng/features/org.eclipse.ecf.provider.generic.datashare.feature</module> + <module>releng/features/org.eclipse.ecf.provider.generic.feature</module> + <module>releng/features/org.eclipse.ecf.provider.generic.remoteservice.feature</module> + <module>releng/features/org.eclipse.ecf.remoteservice.examples.feature</module> <module>releng/features/org.eclipse.ecf.remoteservice.feature</module> - <module>releng/features/org.eclipse.ecf.osgi.services.feature</module> + <module>releng/features/org.eclipse.ecf.remoteservice.rest.feature</module> + <module>releng/features/org.eclipse.ecf.remoteservice.rest.synd.feature</module> + <module>releng/features/org.eclipse.ecf.remoteservice.rosgi.feature</module> + <module>releng/features/org.eclipse.ecf.remoteservice.sdk.examples.feature</module> + <module>releng/features/org.eclipse.ecf.remoteservice.sdk.feature</module> + <module>releng/features/org.eclipse.ecf.remoteservice.servlet.feature</module> + <module>releng/features/org.eclipse.ecf.remoteservice.soap.feature</module> + <module>releng/features/org.eclipse.ecf.sharedobject.feature</module> + <module>releng/features/org.eclipse.ecf.xmpp.feature</module> <module>releng/org.eclipse.ecf.releng.target</module> <module>releng/org.eclipse.ecf.releng.repository</module> diff --git a/protocols/bundles/ch.ethz.iks.r_osgi.remote/META-INF/MANIFEST.MF b/protocols/bundles/ch.ethz.iks.r_osgi.remote/META-INF/MANIFEST.MF index 0769162ec..9896c759d 100644 --- a/protocols/bundles/ch.ethz.iks.r_osgi.remote/META-INF/MANIFEST.MF +++ b/protocols/bundles/ch.ethz.iks.r_osgi.remote/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: ch.ethz.iks.r_osgi.remote -Bundle-Version: 1.0.8.RC1_qualifier +Bundle-Version: 1.0.8.qualifier Bundle-Vendor: %plugin.provider Import-Package: org.objectweb.asm;version="[5.0.1,6.0.0)", org.osgi.framework, diff --git a/protocols/bundles/ch.ethz.iks.r_osgi.remote/build.properties b/protocols/bundles/ch.ethz.iks.r_osgi.remote/build.properties index d45a961ba..532cc5991 100644 --- a/protocols/bundles/ch.ethz.iks.r_osgi.remote/build.properties +++ b/protocols/bundles/ch.ethz.iks.r_osgi.remote/build.properties @@ -7,5 +7,5 @@ bin.includes = META-INF/,\ LICENSE.txt src.includes = about.html,\ LICENSE.txt -jre.compilation.profile = J2SE-1.3 +jre.compilation.profile = J2SE-1.4 javacWarnings.. = -assertIdentifier,-enumIdentifier diff --git a/protocols/bundles/ch.ethz.iks.r_osgi.remote/pom.xml b/protocols/bundles/ch.ethz.iks.r_osgi.remote/pom.xml index d13cf65fa..c265a316b 100644 --- a/protocols/bundles/ch.ethz.iks.r_osgi.remote/pom.xml +++ b/protocols/bundles/ch.ethz.iks.r_osgi.remote/pom.xml @@ -1,84 +1,15 @@ -<?xml version="1.0"?> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>ch.ethz.iks.r-osgi</groupId> - <artifactId>project</artifactId> - <version>1.0.0.RC1</version> - </parent> - <groupId>ch.ethz.iks.r-osgi</groupId> - <artifactId>remote</artifactId> - <packaging>osgi-bundle</packaging> - <name>R-OSGi Remote Service</name> - - <build> - <resources> - <resource> - <targetPath>META-INF</targetPath> - <directory>resources</directory> - </resource> - </resources> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.2</source> - <target>1.1</target> - <optimize>true</optimize> - <debug>false</debug> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.felix.plugins</groupId> - <artifactId>maven-osgi-plugin</artifactId> - <version>0.9.0-incubator-SNAPSHOT</version> - <extensions>true</extensions> - <configuration> - <osgiManifest> - <bundleActivator>ch.ethz.iks.r_osgi.impl.RemoteOSGiActivator</bundleActivator> - <bundleName>R-OSGi Remote Service</bundleName> - <bundleSymbolicName>ch.ethz.iks.r_osgi.remote</bundleSymbolicName> - <bundleDescription>R-OSGi Remote Service</bundleDescription> - <bundleVendor>Jan S. Rellermeyer, ETH Zurich</bundleVendor> - <importPackage>org.osgi.framework, org.osgi.util.tracker, org.osgi.service.log, org.osgi.service.event</importPackage> - <exportPackage>ch.ethz.iks.r_osgi, ch.ethz.iks.r_osgi.channels, ch.ethz.iks.r_osgi.messages, ch.ethz.iks.r_osgi.types, ch.ethz.iks.r_osgi.service_discovery, ch.ethz.iks.util, org.objectweb.asm</exportPackage> - <dynamicImportPackage>*</dynamicImportPackage> - </osgiManifest> - </configuration> - </plugin> - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi</artifactId> - <version>3.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.ow2.asm</groupId> - <artifactId>asm</artifactId> - <version>5.0.1</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - </dependencies> - - <reporting> - <plugins> - <plugin> - <artifactId>maven-site-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - </plugin> - </plugins> - </reporting> - +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ch.ethz.iks.r_osgi.remote</artifactId> + <version>1.0.8-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> </project> diff --git a/protocols/bundles/ch.ethz.iks.slp/pom.xml b/protocols/bundles/ch.ethz.iks.slp/pom.xml index 101133392..b7484b116 100644 --- a/protocols/bundles/ch.ethz.iks.slp/pom.xml +++ b/protocols/bundles/ch.ethz.iks.slp/pom.xml @@ -1,345 +1,15 @@ -<project> +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> - <name>jSLP-OSGi</name> - <groupId>ch.ethz.iks.slp</groupId> - <artifactId>jslp-osgi</artifactId> - <version>1.1.0.RC1</version> - <packaging>bundle</packaging> - - <url>http://jslp.sourceforge.net</url> - - <organization> - <name>Systems Group, ETH Zurich</name> - <url>http://www.systems.ethz.ch</url> - </organization> - - <developers> - <developer> - <id>rjan</id> - <name>Jan S. Rellermeyer</name> - <email>rellermeyer_at_inf.ethz.ch</email> - <url>http://people.inf.ethz.ch/rjan</url> - <organization>Systems Group, ETH Zurich</organization> - <organizationUrl>http://www.systems.ethz.ch</organizationUrl> - <roles> - <role>Project creator</role> - <role>Researcher</role> - </roles> - <timezone>+1</timezone> - </developer> - <developer> - <id>lemmster</id> - <name>Markus Alexander Kuppe</name> - <email>jslp.sf.net_at_lemmster.de</email> - <url>http://www.lemmster.de</url> - <organization>Versant GmbH</organization> - <organizationUrl>http://www.versant.com</organizationUrl> - <roles> - <role>Developer</role> - </roles> - <timezone>+1</timezone> - </developer> - </developers> - - <licenses> - <license> - <name>BSD License</name> - <distribution>repo</distribution> - <url>src/main/resources/LICENSE.txt</url> - </license> - </licenses> - - <scm> - <connection>scm:svn:https://jslp.svn.sourceforge.net/svnroot/jslp</connection> - <developerConnection>scm:svn:https://rjan@jslp.svn.sourceforge.net/svnroot/jslp</developerConnection> - <url>http://jslp.svn.sourceforge.net/jslp</url> - </scm> - - <build> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.2</version> - <executions> - <execution> - <phase>integration-test</phase> - <configuration> - <tasks> - <property name="debug.suspend" value="n" /> - <property name="debug.port" value="10044" /> - <property name="jslp.port" value="10427" /> - <echo message="Compiling the unit test environment..."/> - <mkdir dir="runtimeTests/target"/> - <condition property="maven.executable" value="mvn.bat"> - <os family="windows" /> - </condition> - <property name="maven.executable" value="mvn" /> - <exec dir="runtimeTests" executable="${maven.home}/bin/${maven.executable}"> - <arg line="package"/> - </exec> - <delete dir="test/storage" quiet="true"/> -<!-- - <echo file="target/init.xargs" append="false"> - -Dorg.osgi.framework.system.packages=junit.framework,junit.textui,org.apache.tools.ant.taskdefs.optional.junit - -init - -istart file:target/jslp-osgi-${pom.version}.jar - -istart file:runtimeTests/target/jslp-test-${pom.version}.jar - </echo> - <java fork="true" classname="ch.ethz.iks.concierge.framework.Framework" failonerror="true" resultproperty="testresult"> - <classpath> - <pathelement location="${maven.dependency.ch.ethz.iks.concierge.concierge.jar.path}"/> - <pathelement location="${maven.dependency.junit.junit.jar.path}"/> - </classpath> - <jvmarg value="-Dxargs=target/init.xargs"/> - <jvmarg value="-Dnet.slp.port=${jslp.port}"/> - <jvmarg value="-Dch.ethz.iks.concierge.log.level=4"/> - <jvmarg value="-Dch.ethz.iks.concierge.log.enabled=true"/> - <jvmarg value="-Dch.ethz.iks.slp.debug=true" /> - <jvmarg value="-Dnet.slp.traceDATraffic=true" /> - <jvmarg value="-Dnet.slp.traceMsg=true" /> - <jvmarg value="-Dnet.slp.traceDrop=true" /> - <jvmarg value="-Dnet.slp.traceReg=true" /> - <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${debug.port},server=y,suspend=${debug.suspend}" /> - <jvmarg value="-Xdebug" /> - <jvmarg value="-Dnet.slp.versionUnderTest=${pom.version}" /> - </java> - <delete dir="test/storage" quiet="true"/> - --> - <!-- run integration tests with two instances running --> - <get src="http://ecf2.osuosl.org/ch.ethz.iks.slp_1.1.0.v20090227-1900.jar" dest="target/ch.ethz.iks.slp_1.1.0.v20090227-1900.jar"/> - <get src="http://ecf2.osuosl.org/org.eclipse.ant.optional.junit_3.2.200.jar" dest="target/org.eclipse.ant.optional.junit_3.2.200.jar"/> - - <mkdir dir="target/configuration" /> - <echo file="target/configuration/config.ini" append="false"> - eclipse.ignoreApp=true - eclipse.consoleLog=true - osgi.noShutdown=true - osgi.bundles=file:${maven.dependency.org.eclipse.osgi.services.jar.path}@2:start, \ - file:${maven.dependency.org.junit.jar.path}@start, \ - file:${maven.dependency.org.apache.ant.jar.path}@start, \ - file:${basedir}/target/ch.ethz.iks.slp_1.1.0.v20090227-1900.jar@start, \ - file:${basedir}/target/org.eclipse.ant.optional.junit_3.2.200.jar, \ - file:${basedir}/target/jslp-osgi-${pom.version}.jar@start, \ - file:${basedir}/runtimeTests/target/jslp-test-${pom.version}.jar@start - </echo> - <java fork="true" classname="org.eclipse.core.runtime.adaptor.EclipseStarter" failonerror="true" resultproperty="testresult2"> - <classpath> - <pathelement location="${maven.dependency.org.eclipse.osgi.jar.path}"/> - </classpath> - <!-- osgi locations --> - <jvmarg value="-Dosgi.configuration.area=target/configuration" /> - <jvmarg value="-Dtest.result.output.dir=target/surefire-reports/" /> - <!-- jSLP options --> - <jvmarg value="-Dnet.slp.port=${jslp.port}"/> - <jvmarg value="-Dch.ethz.iks.slp.debug=true" /> - <jvmarg value="-Dnet.slp.traceDATraffic=true" /> - <jvmarg value="-Dnet.slp.traceMsg=true" /> - <jvmarg value="-Dnet.slp.traceDrop=true" /> - <jvmarg value="-Dnet.slp.traceReg=true" /> - <jvmarg value="-Dnet.slp.versionUnderTest=${pom.version}" /> - <!-- enable remote debug mode --> - <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${debug.port},server=y,suspend=${debug.suspend}" /> - <jvmarg value="-Xdebug" /> - <jvmarg value="-noverify"/> - </java> - - <!-- run integration tests with openslp running on 427 --> - <!-- - <condition property="openslp.running"> - <socket server="localhost" port="427"/> - </condition> - <fail message="An OpenSLP instance must be running on port 427" unless="openslp.running"/> - <echo file="target/configuration/config.ini" append="false"> - eclipse.ignoreApp=true - eclipse.consoleLog=true - osgi.bundles=file:${maven.dependency.org.eclipse.osgi.services.jar.path}@2:start, \ - file:${maven.dependency.org.junit.jar.path}@start, \ - file:${basedir}/target/jslp-osgi-${pom.version}.jar@start, \ - file:${basedir}/runtimeTests/target/jslp-test-${pom.version}.jar@start - </echo> - <java fork="true" classname="org.eclipse.core.runtime.adaptor.EclipseStarter" failonerror="true" resultproperty="testresult3"> - <classpath> - <pathelement location="${maven.dependency.org.eclipse.osgi.jar.path}"/> - </classpath> - <jvmarg value="-Dosgi.configuration.area=target/configuration" /> - <jvmarg value="-Dnet.slp.port=427"/> - <jvmarg value="-Dch.ethz.iks.slp.debug=true" /> - <jvmarg value="-Dnet.slp.traceDATraffic=true" /> - <jvmarg value="-Dnet.slp.traceMsg=true" /> - <jvmarg value="-Dnet.slp.traceDrop=true" /> - <jvmarg value="-Dnet.slp.traceReg=true" /> - <jvmarg value="-Dnet.slp.versionUnderTest=${pom.version}" /> - <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${debug.port},server=y,suspend=${debug.suspend}" /> - <jvmarg value="-Xdebug" /> - <jvmarg value="-noverify"/> - </java> - --> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.2</source> - <target>1.1</target> - <optimize>true</optimize> - <debug>false</debug> - </configuration> - </plugin> - <!-- http://felix.apache.org/site/maven-bundle-plugin-bnd.html --> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Include-Resource>{maven-resources}, {maven-dependencies}, target/classes</Include-Resource> - <Bundle-Version>${pom.version}</Bundle-Version> - <Bundle-Name>jslp-osgi</Bundle-Name> - <Bundle-SymbolicName>ch.ethz.iks.slp</Bundle-SymbolicName> - <Export-Package>ch.ethz.iks.slp;version=1.0.0</Export-Package> - <_include>~META-INF/MANIFEST.MF</_include> - <!-- BND just produces Bundle-ManifestVersion: 2 headers which we don't want --> - <_removeheaders>Bundle-ManifestVersion</_removeheaders> - </instructions> - </configuration> - </plugin> - <!-- runtimeTests is not automatically run by parent clean, thus manually purge folder --> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <version>2.4</version> - <configuration> - <filesets> - <fileset> - <directory>runtimeTests/target/</directory> - </fileset> - </filesets> - </configuration> - </plugin> - </plugins> - <resources> - <resource> - <directory>src/main/resources</directory> - </resource> - </resources> - </build> - - <reporting> - <plugins> - <plugin> - <artifactId>maven-site-plugin</artifactId> - <configuration> - <templateFile>maven-site-jslp.vm</templateFile> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <excludePackageNames>ch.ethz.iks.slp.impl,org.osgi.service.log</excludePackageNames> - </configuration> - </plugin> - </plugins> - </reporting> - - <dependencies> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi</artifactId> - <version>3.0.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.0.4</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>ch.ethz.iks.concierge</groupId> - <artifactId>concierge</artifactId> - <version>1.0.0</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.eclipse</groupId> - <artifactId>osgi</artifactId> - <version>3.3.0-v20070530</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.eclipse.osgi</groupId> - <artifactId>services</artifactId> - <version>3.1.200-v20070605</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.eclipse</groupId> - <artifactId>osgi</artifactId> - <version>3.3.0-v20070530</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.eclipse.osgi</groupId> - <artifactId>services</artifactId> - <version>3.1.200-v20070605</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org</groupId> - <artifactId>junit</artifactId> - <version>3.8.2-v200706111738</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache</groupId> - <artifactId>ant</artifactId> - <version>1.7.0-v200706080842</version> - <scope>test</scope> - </dependency> - </dependencies> - - <repositories> - <repository> - <id>iks-repository</id> - <name>ETH Zurich IKS Repository</name> - <url>http://www.flowsgi.inf.ethz.ch/repository/maven2/</url> - </repository> - <repository> - <id>Maven eclipse</id> - <name>Eclipse Maven</name> - <url>http://repo2.maven.org/eclipse/</url> - </repository> - </repositories> - <pluginRepositories> - <pluginRepository> - <id>iks-repository</id> - <name>ETH Zurich IKS Repository</name> - <url>http://www.flowsgi.inf.ethz.ch/repository/maven2/</url> - </pluginRepository> - </pluginRepositories> - - <distributionManagement> - <site> - <id>sourceforge-site</id> - <url>scp://shell.sourceforge.net/home/groups/j/js/jslp/htdocs/</url> - </site> - <repository> - <id>iks-snapshots</id> - <name>ETH Zurich IKS Snapshots</name> - <url>scp://flowsgi.inf.ethz.ch/repository/maven2</url> - </repository> - </distributionManagement> -</project>
\ No newline at end of file + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ch.ethz.iks.slp</artifactId> + <version>1.1.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/protocols/bundles/org.eclipse.ecf.protocol.bittorrent/pom.xml b/protocols/bundles/org.eclipse.ecf.protocol.bittorrent/pom.xml new file mode 100644 index 000000000..081edcefe --- /dev/null +++ b/protocols/bundles/org.eclipse.ecf.protocol.bittorrent/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.protocol.bittorrent</artifactId> + <version>0.3.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/protocols/bundles/org.eclipse.ecf.protocol.msn/pom.xml b/protocols/bundles/org.eclipse.ecf.protocol.msn/pom.xml new file mode 100644 index 000000000..bc7e8230b --- /dev/null +++ b/protocols/bundles/org.eclipse.ecf.protocol.msn/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.protocol.msn</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/protocols/bundles/org.jivesoftware.smack/pom.xml b/protocols/bundles/org.jivesoftware.smack/pom.xml new file mode 100644 index 000000000..4672d4051 --- /dev/null +++ b/protocols/bundles/org.jivesoftware.smack/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.jivesoftware.smack</artifactId> + <version>3.3.100-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smack/keepalive/KeepAliveManager.java b/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smack/keepalive/KeepAliveManager.java index 5246896fc..4170d6ab9 100644 --- a/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smack/keepalive/KeepAliveManager.java +++ b/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smack/keepalive/KeepAliveManager.java @@ -95,7 +95,6 @@ public class KeepAliveManager { private synchronized static void enableExecutorService() { if (periodicPingExecutorService == null) { periodicPingExecutorService = new ScheduledThreadPoolExecutor(1, new ThreadFactory() { - @Override public Thread newThread(Runnable runnable) { Thread pingThread = new Thread(runnable, "Smack Keepalive"); pingThread.setDaemon(true); @@ -133,7 +132,6 @@ public class KeepAliveManager { // one arrives. connection.addPacketListener(new PacketListener() { - @Override public void processPacket(Packet packet) { // reschedule the ping based on this last server contact lastSuccessfulContact = System.currentTimeMillis(); @@ -145,29 +143,24 @@ public class KeepAliveManager { private void init() { connection.addConnectionListener(new ConnectionListener() { - @Override public void connectionClosed() { stopPingServerTask(); handleDisconnect(connection); } - @Override public void connectionClosedOnError(Exception arg0) { stopPingServerTask(); handleDisconnect(connection); } - @Override public void reconnectionSuccessful() { handleConnect(); schedulePingServerTask(); } - @Override public void reconnectingIn(int seconds) { } - @Override public void reconnectionFailed(Exception e) { } }); @@ -272,7 +265,6 @@ public class KeepAliveManager { if (pingInterval > 0) { periodicPingTask = periodicPingExecutorService.schedule(new Runnable() { - @Override public void run() { Ping ping = new Ping(); PacketFilter responseFilter = new PacketIDFilter(ping.getPacketID()); @@ -282,7 +274,6 @@ public class KeepAliveManager { if (response != null) { // Schedule a collector for the ping reply, notify listeners if none is received. periodicPingExecutorService.schedule(new Runnable() { - @Override public void run() { Packet result = response.nextResult(1); diff --git a/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smack/util/Base32Encoder.java b/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smack/util/Base32Encoder.java index 0a4ea21e7..5f78f5d33 100644 --- a/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smack/util/Base32Encoder.java +++ b/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smack/util/Base32Encoder.java @@ -40,7 +40,6 @@ public class Base32Encoder implements StringEncoder { return instance; } - @Override public String decode(String str) { ByteArrayOutputStream bs = new ByteArrayOutputStream(); byte[] raw = str.getBytes(); @@ -99,7 +98,6 @@ public class Base32Encoder implements StringEncoder { return new String(bs.toByteArray()); } - @Override public String encode(String str) { byte[] b = str.getBytes(); ByteArrayOutputStream os = new ByteArrayOutputStream(); diff --git a/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smack/util/dns/DNSJavaResolver.java b/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smack/util/dns/DNSJavaResolver.java index dd93fd3ae..e8aac1f21 100644 --- a/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smack/util/dns/DNSJavaResolver.java +++ b/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smack/util/dns/DNSJavaResolver.java @@ -38,7 +38,6 @@ public class DNSJavaResolver implements DNSResolver { return instance; } - @Override public List<SRVRecord> lookupSRVRecords(String name) { List<SRVRecord> res = new ArrayList<SRVRecord>(); diff --git a/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smack/util/dns/JavaxResolver.java b/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smack/util/dns/JavaxResolver.java index ae3dbf6f6..bb443b439 100644 --- a/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smack/util/dns/JavaxResolver.java +++ b/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smack/util/dns/JavaxResolver.java @@ -66,7 +66,6 @@ public class JavaxResolver implements DNSResolver { return dirContext != null; } - @Override public List<SRVRecord> lookupSRVRecords(String name) { List<SRVRecord> res = new ArrayList<SRVRecord>(); diff --git a/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smack/util/dns/SRVRecord.java b/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smack/util/dns/SRVRecord.java index 457e40eca..948fd38ff 100644 --- a/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smack/util/dns/SRVRecord.java +++ b/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smack/util/dns/SRVRecord.java @@ -60,7 +60,6 @@ public class SRVRecord extends HostAddress implements Comparable<SRVRecord> { return weight; } - @Override public int compareTo(SRVRecord other) { // According to RFC2782, // "[a] client MUST attempt to contact the target host with the lowest-numbered priority it can reach". diff --git a/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smackx/LastActivityManager.java b/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smackx/LastActivityManager.java index 7729bc07a..788de3613 100644 --- a/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smackx/LastActivityManager.java +++ b/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smackx/LastActivityManager.java @@ -120,7 +120,6 @@ public class LastActivityManager { }, new PacketTypeFilter(Presence.class)); connection.addPacketListener(new PacketListener() { - @Override public void processPacket(Packet packet) { Message message = (Message) packet; // if it's not an error message, reset the idle time diff --git a/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smackx/commands/AdHocCommandManager.java b/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smackx/commands/AdHocCommandManager.java index 737a204ab..5e0e7680b 100644 --- a/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smackx/commands/AdHocCommandManager.java +++ b/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smackx/commands/AdHocCommandManager.java @@ -187,7 +187,6 @@ public class AdHocCommandManager { return answer; } - @Override public List<PacketExtension> getNodePacketExtensions() { return null; } @@ -325,7 +324,6 @@ public class AdHocCommandManager { return null; } - @Override public List<PacketExtension> getNodePacketExtensions() { return null; } @@ -747,4 +745,4 @@ public class AdHocCommandManager { return ownerJID; } } -}
\ No newline at end of file +} diff --git a/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smackx/debugger/EnhancedDebugger.java b/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smackx/debugger/EnhancedDebugger.java index 5eacaf3dd..3d6e7b6db 100644 --- a/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smackx/debugger/EnhancedDebugger.java +++ b/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smackx/debugger/EnhancedDebugger.java @@ -324,7 +324,6 @@ public class EnhancedDebugger implements SmackDebugger { clearb.addActionListener(new AbstractAction() { private static final long serialVersionUID = -8576045822764763613L; - @Override public void actionPerformed(ActionEvent e) { messagesTable.setRowCount(0); diff --git a/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smackx/entitycaps/EntityCapsManager.java b/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smackx/entitycaps/EntityCapsManager.java index 1da222efd..9d3a0e67c 100644 --- a/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smackx/entitycaps/EntityCapsManager.java +++ b/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smackx/entitycaps/EntityCapsManager.java @@ -267,7 +267,6 @@ public class EntityCapsManager { connection.addPacketListener(new PacketListener() { // Listen for remote presence stanzas with the caps extension // If we receive such a stanza, record the JID and nodeVer - @Override public void processPacket(Packet packet) { if (!entityCapsEnabled()) return; @@ -291,7 +290,6 @@ public class EntityCapsManager { packetFilter = new AndFilter(new PacketTypeFilter(Presence.class), new NotFilter(new PacketExtensionFilter( ELEMENT, NAMESPACE))); connection.addPacketListener(new PacketListener() { - @Override public void processPacket(Packet packet) { // always remove the JID from the map, even if entityCaps are // disabled @@ -302,7 +300,6 @@ public class EntityCapsManager { packetFilter = new PacketTypeFilter(Presence.class); connection.addPacketSendingListener(new PacketListener() { - @Override public void processPacket(Packet packet) { presenceSend = true; } @@ -462,22 +459,18 @@ public class EntityCapsManager { List<Identity> identities = new LinkedList<Identity>(ServiceDiscoveryManager.getIdentities()); List<PacketExtension> packetExtensions = sdm.getExtendedInfoAsList(); - @Override public List<Item> getNodeItems() { return null; } - @Override public List<String> getNodeFeatures() { return features; } - @Override public List<Identity> getNodeIdentities() { return identities; } - @Override public List<PacketExtension> getNodePacketExtensions() { return packetExtensions; } diff --git a/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smackx/entitycaps/cache/SimpleDirectoryPersistentCache.java b/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smackx/entitycaps/cache/SimpleDirectoryPersistentCache.java index ae0e11633..e3feb189e 100644 --- a/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smackx/entitycaps/cache/SimpleDirectoryPersistentCache.java +++ b/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smackx/entitycaps/cache/SimpleDirectoryPersistentCache.java @@ -84,7 +84,6 @@ public class SimpleDirectoryPersistentCache implements EntityCapsPersistentCache this.filenameEncoder = filenameEncoder; } - @Override public void addDiscoverInfoByNodePersistent(String node, DiscoverInfo info) { String filename = filenameEncoder.encode(node); File nodeFile = new File(cacheDir, filename); @@ -96,7 +95,6 @@ public class SimpleDirectoryPersistentCache implements EntityCapsPersistentCache } } - @Override public void replay() throws IOException { File[] files = cacheDir.listFiles(); for (File f : files) { diff --git a/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smackx/muc/MultiUserChat.java b/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smackx/muc/MultiUserChat.java index 00f7c180a..097cc19c4 100644 --- a/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smackx/muc/MultiUserChat.java +++ b/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smackx/muc/MultiUserChat.java @@ -135,7 +135,6 @@ public class MultiUserChat { return null; } - @Override public List<PacketExtension> getNodePacketExtensions() { return null; } diff --git a/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smackx/receipts/DeliveryReceipt.java b/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smackx/receipts/DeliveryReceipt.java index d58fab23c..476e92d59 100644 --- a/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smackx/receipts/DeliveryReceipt.java +++ b/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smackx/receipts/DeliveryReceipt.java @@ -42,19 +42,16 @@ public class DeliveryReceipt implements PacketExtension return id; } - @Override public String getElementName() { return ELEMENT; } - @Override public String getNamespace() { return NAMESPACE; } - @Override public String toXML() { return "<received xmlns='" + NAMESPACE + "' id='" + id + "'/>"; diff --git a/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smackx/receipts/DeliveryReceiptManager.java b/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smackx/receipts/DeliveryReceiptManager.java index 125b87e63..398d4f93f 100644 --- a/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smackx/receipts/DeliveryReceiptManager.java +++ b/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smackx/receipts/DeliveryReceiptManager.java @@ -102,7 +102,6 @@ public class DeliveryReceiptManager implements PacketListener { } // handle incoming receipts and receipt requests - @Override public void processPacket(Packet packet) { DeliveryReceipt dr = (DeliveryReceipt)packet.getExtension( DeliveryReceipt.ELEMENT, DeliveryReceipt.NAMESPACE); diff --git a/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smackx/receipts/DeliveryReceiptRequest.java b/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smackx/receipts/DeliveryReceiptRequest.java index 28bd0c8ec..575bd5136 100644 --- a/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smackx/receipts/DeliveryReceiptRequest.java +++ b/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smackx/receipts/DeliveryReceiptRequest.java @@ -46,7 +46,6 @@ public class DeliveryReceiptRequest implements PacketExtension * This Provider parses and returns DeliveryReceiptRequest packets. */ public static class Provider implements PacketExtensionProvider { - @Override public PacketExtension parseExtension(XmlPullParser parser) { return new DeliveryReceiptRequest(); } diff --git a/providers/bundles/org.eclipse.ecf.provider.bittorrent.ui/pom.xml b/providers/bundles/org.eclipse.ecf.provider.bittorrent.ui/pom.xml new file mode 100644 index 000000000..421cd985c --- /dev/null +++ b/providers/bundles/org.eclipse.ecf.provider.bittorrent.ui/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.provider.bittorrent.ui</artifactId> + <version>0.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/providers/bundles/org.eclipse.ecf.provider.bittorrent/pom.xml b/providers/bundles/org.eclipse.ecf.provider.bittorrent/pom.xml new file mode 100644 index 000000000..dfb993193 --- /dev/null +++ b/providers/bundles/org.eclipse.ecf.provider.bittorrent/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.provider.bittorrent</artifactId> + <version>0.3.200-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.efs/pom.xml b/providers/bundles/org.eclipse.ecf.provider.filetransfer.efs/pom.xml new file mode 100644 index 000000000..44d2d4b54 --- /dev/null +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.efs/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.provider.filetransfer.efs</artifactId> + <version>1.5.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.scp/pom.xml b/providers/bundles/org.eclipse.ecf.provider.filetransfer.scp/pom.xml new file mode 100644 index 000000000..c84e29013 --- /dev/null +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.scp/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.provider.filetransfer.scp</artifactId> + <version>2.1.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/providers/bundles/org.eclipse.ecf.provider.irc.ui/pom.xml b/providers/bundles/org.eclipse.ecf.provider.irc.ui/pom.xml new file mode 100644 index 000000000..04a499696 --- /dev/null +++ b/providers/bundles/org.eclipse.ecf.provider.irc.ui/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.provider.irc.ui</artifactId> + <version>1.3.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/providers/bundles/org.eclipse.ecf.provider.irc/pom.xml b/providers/bundles/org.eclipse.ecf.provider.irc/pom.xml new file mode 100644 index 000000000..702a921db --- /dev/null +++ b/providers/bundles/org.eclipse.ecf.provider.irc/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.provider.irc</artifactId> + <version>1.3.200-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/providers/bundles/org.eclipse.ecf.provider.jslp/pom.xml b/providers/bundles/org.eclipse.ecf.provider.jslp/pom.xml new file mode 100644 index 000000000..1a867582a --- /dev/null +++ b/providers/bundles/org.eclipse.ecf.provider.jslp/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.provider.jslp</artifactId> + <version>3.2.100-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/providers/bundles/org.eclipse.ecf.provider.msn.ui/pom.xml b/providers/bundles/org.eclipse.ecf.provider.msn.ui/pom.xml new file mode 100644 index 000000000..843ee0e45 --- /dev/null +++ b/providers/bundles/org.eclipse.ecf.provider.msn.ui/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.provider.msn.ui</artifactId> + <version>1.3.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/providers/bundles/org.eclipse.ecf.provider.msn/pom.xml b/providers/bundles/org.eclipse.ecf.provider.msn/pom.xml new file mode 100644 index 000000000..63f123f79 --- /dev/null +++ b/providers/bundles/org.eclipse.ecf.provider.msn/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.provider.msn</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/providers/bundles/org.eclipse.ecf.provider.r_osgi/pom.xml b/providers/bundles/org.eclipse.ecf.provider.r_osgi/pom.xml new file mode 100644 index 000000000..329f19e26 --- /dev/null +++ b/providers/bundles/org.eclipse.ecf.provider.r_osgi/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.provider.r_osgi</artifactId> + <version>3.5.500-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/providers/bundles/org.eclipse.ecf.provider.remoteservice/pom.xml b/providers/bundles/org.eclipse.ecf.provider.remoteservice/pom.xml new file mode 100644 index 000000000..acebb81a4 --- /dev/null +++ b/providers/bundles/org.eclipse.ecf.provider.remoteservice/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.provider.remoteservice</artifactId> + <version>4.2.100-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/providers/bundles/org.eclipse.ecf.provider.ui/pom.xml b/providers/bundles/org.eclipse.ecf.provider.ui/pom.xml new file mode 100644 index 000000000..0f8a142af --- /dev/null +++ b/providers/bundles/org.eclipse.ecf.provider.ui/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.provider.ui</artifactId> + <version>1.4.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp.datashare/pom.xml b/providers/bundles/org.eclipse.ecf.provider.xmpp.datashare/pom.xml new file mode 100644 index 000000000..d076d7aa4 --- /dev/null +++ b/providers/bundles/org.eclipse.ecf.provider.xmpp.datashare/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.provider.xmpp.datashare</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp.remoteservice/pom.xml b/providers/bundles/org.eclipse.ecf.provider.xmpp.remoteservice/pom.xml new file mode 100644 index 000000000..6cb46f3c6 --- /dev/null +++ b/providers/bundles/org.eclipse.ecf.provider.xmpp.remoteservice/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.provider.xmpp.remoteservice</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp.ui/pom.xml b/providers/bundles/org.eclipse.ecf.provider.xmpp.ui/pom.xml new file mode 100644 index 000000000..fb25175dd --- /dev/null +++ b/providers/bundles/org.eclipse.ecf.provider.xmpp.ui/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.provider.xmpp.ui</artifactId> + <version>2.2.100-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/pom.xml b/providers/bundles/org.eclipse.ecf.provider.xmpp/pom.xml new file mode 100644 index 000000000..726e19c7a --- /dev/null +++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.provider.xmpp</artifactId> + <version>3.2.200-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/releng/features/org.eclipse.ecf.core/pom.xml b/releng/features/org.eclipse.ecf.core/pom.xml new file mode 100644 index 000000000..c05b4af53 --- /dev/null +++ b/releng/features/org.eclipse.ecf.core/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.core</artifactId> + <version>3.13.2-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> +</project> diff --git a/releng/features/org.eclipse.ecf.discovery.slp.feature/pom.xml b/releng/features/org.eclipse.ecf.discovery.slp.feature/pom.xml new file mode 100644 index 000000000..d24761b6c --- /dev/null +++ b/releng/features/org.eclipse.ecf.discovery.slp.feature/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.discovery.slp.feature</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> +</project> diff --git a/releng/features/org.eclipse.ecf.eventadmin.examples.feature/pom.xml b/releng/features/org.eclipse.ecf.eventadmin.examples.feature/pom.xml new file mode 100644 index 000000000..c36f0a3ff --- /dev/null +++ b/releng/features/org.eclipse.ecf.eventadmin.examples.feature/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.eventadmin.examples.feature</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> +</project> diff --git a/releng/features/org.eclipse.ecf.eventadmin.feature/pom.xml b/releng/features/org.eclipse.ecf.eventadmin.feature/pom.xml new file mode 100644 index 000000000..165921c55 --- /dev/null +++ b/releng/features/org.eclipse.ecf.eventadmin.feature/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.eventadmin.feature</artifactId> + <version>2.0.0-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> +</project> diff --git a/releng/features/org.eclipse.ecf.provider.generic.remoteservice.feature/pom.xml b/releng/features/org.eclipse.ecf.provider.generic.remoteservice.feature/pom.xml new file mode 100644 index 000000000..5b6af7ba4 --- /dev/null +++ b/releng/features/org.eclipse.ecf.provider.generic.remoteservice.feature/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.provider.generic.remoteservice.feature</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> +</project> diff --git a/releng/features/org.eclipse.ecf.remoteservice.examples.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.examples.feature/pom.xml new file mode 100644 index 000000000..2c4b65360 --- /dev/null +++ b/releng/features/org.eclipse.ecf.remoteservice.examples.feature/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.remoteservice.examples.feature</artifactId> + <version>1.3.0-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> +</project> diff --git a/releng/features/org.eclipse.ecf.remoteservice.rest.feature/feature.xml b/releng/features/org.eclipse.ecf.remoteservice.rest.feature/feature.xml index a45ce6d96..852a42c0f 100644 --- a/releng/features/org.eclipse.ecf.remoteservice.rest.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.remoteservice.rest.feature/feature.xml @@ -34,6 +34,7 @@ https://wiki.eclipse.org/ECF#OSGi_Remote_Services <import plugin="org.apache.commons.logging" version="1.1.1" match="compatible"/> <import plugin="org.apache.httpcomponents.httpclient" version="4.2" match="compatible"/> <import plugin="org.apache.httpcomponents.httpcore" version="4.2" match="compatible"/> + <import plugin="org.json" version="1.0.0" match="compatible"/> </requires> <plugin @@ -43,11 +44,4 @@ https://wiki.eclipse.org/ECF#OSGi_Remote_Services version="0.0.0" unpack="false"/> - <plugin - id="org.json" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - </feature> diff --git a/releng/features/org.eclipse.ecf.remoteservice.rest.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.rest.feature/pom.xml new file mode 100644 index 000000000..2ea82a366 --- /dev/null +++ b/releng/features/org.eclipse.ecf.remoteservice.rest.feature/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.remoteservice.rest.feature</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> +</project> diff --git a/releng/features/org.eclipse.ecf.remoteservice.rest.synd.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.rest.synd.feature/pom.xml new file mode 100644 index 000000000..2b21222c9 --- /dev/null +++ b/releng/features/org.eclipse.ecf.remoteservice.rest.synd.feature/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.remoteservice.rest.synd.feature</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> +</project> diff --git a/releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/pom.xml new file mode 100644 index 000000000..9e82193f5 --- /dev/null +++ b/releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.remoteservice.rosgi.feature</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> +</project> diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.examples.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.sdk.examples.feature/pom.xml new file mode 100644 index 000000000..0839e46a0 --- /dev/null +++ b/releng/features/org.eclipse.ecf.remoteservice.sdk.examples.feature/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.remoteservice.sdk.examples.feature</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> +</project> diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/pom.xml new file mode 100644 index 000000000..537c5b4fc --- /dev/null +++ b/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.remoteservice.sdk.feature</artifactId> + <version>3.13.2-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> +</project> diff --git a/releng/features/org.eclipse.ecf.remoteservice.servlet.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.servlet.feature/pom.xml new file mode 100644 index 000000000..5408d20a5 --- /dev/null +++ b/releng/features/org.eclipse.ecf.remoteservice.servlet.feature/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.remoteservice.servlet.feature</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> +</project> diff --git a/releng/features/org.eclipse.ecf.remoteservice.soap.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.soap.feature/pom.xml new file mode 100644 index 000000000..d5bf6ec38 --- /dev/null +++ b/releng/features/org.eclipse.ecf.remoteservice.soap.feature/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.remoteservice.soap.feature</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> +</project> diff --git a/releng/features/org.eclipse.ecf.xmpp.feature/pom.xml b/releng/features/org.eclipse.ecf.xmpp.feature/pom.xml new file mode 100644 index 000000000..a0f59e99f --- /dev/null +++ b/releng/features/org.eclipse.ecf.xmpp.feature/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.xmpp.feature</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> +</project> diff --git a/releng/org.eclipse.ecf.releng.repository/category.xml b/releng/org.eclipse.ecf.releng.repository/category.xml index 500ccac92..168831c01 100644 --- a/releng/org.eclipse.ecf.releng.repository/category.xml +++ b/releng/org.eclipse.ecf.releng.repository/category.xml @@ -1,5 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <site> + <feature id="org.eclipse.ecf.core" version="0.0.0"> + <category name="sdk"/> + </feature> + <feature id="org.eclipse.ecf.core.source" version="0.0.0"> + <category name="sdk"/> + </feature> <feature id="org.eclipse.ecf.core.feature" version="0.0.0"> <category name="core"/> </feature> @@ -18,45 +24,6 @@ <feature id="org.eclipse.ecf.filetransfer.ssl.feature" version="0.0.0"> <category name="core"/> </feature> - <feature id="org.eclipse.ecf.discovery.feature" version="0.0.0"> - <category name="core"/> - </feature> - <feature id="org.eclipse.ecf.discovery.dnssd.feature" version="0.0.0"> - <category name="core"/> - </feature> - <feature id="org.eclipse.ecf.discovery.jmdns.feature" version="0.0.0"> - <category name="core"/> - </feature> - <feature id="org.eclipse.ecf.discovery.zookeeper.feature" version="0.0.0"> - <category name="core"/> - </feature> - <feature id="org.eclipse.ecf.sharedobject.feature" version="0.0.0"> - <category name="core"/> - </feature> - <feature id="org.eclipse.ecf.provider.generic.feature" version="0.0.0"> - <category name="core"/> - </feature> - <feature id="org.eclipse.ecf.docshare.feature" version="0.0.0"> - <category name="core"/> - </feature> - <feature id="org.eclipse.ecf.datashare.feature" version="0.0.0"> - <category name="core"/> - </feature> - <feature id="org.eclipse.ecf.presence.feature" version="0.0.0"> - <category name="core"/> - </feature> - <feature id="org.eclipse.ecf.console.feature" version="0.0.0"> - <category name="core"/> - </feature> - <feature id="org.eclipse.ecf.provider.generic.datashare.feature" version="0.0.0"> - <category name="core"/> - </feature> - <feature id="org.eclipse.ecf.remoteservice.feature" version="0.0.0"> - <category name="core"/> - </feature> - <feature id="org.eclipse.ecf.osgi.services.feature" version="0.0.0"> - <category name="core"/> - </feature> <feature id="org.eclipse.ecf.core.feature.source" version="0.0.0"> <category name="core sources"/> </feature> @@ -75,45 +42,20 @@ <feature id="org.eclipse.ecf.filetransfer.ssl.feature.source" version="0.0.0"> <category name="core sources"/> </feature> - <feature id="org.eclipse.ecf.discovery.feature.source" version="0.0.0"> - <category name="core sources"/> + <feature id="org.eclipse.ecf.remoteservice.sdk.examples.feature" version="0.0.0"> + <category name="remoteservices"/> </feature> - <feature id="org.eclipse.ecf.discovery.dnssd.feature.source" version="0.0.0"> - <category name="core sources"/> + <feature id="org.eclipse.ecf.remoteservice.sdk.examples.feature.source" version="0.0.0"> + <category name="remoteservices"/> </feature> - <feature id="org.eclipse.ecf.discovery.jmdns.feature.source" version="0.0.0"> - <category name="core sources"/> + <feature id="org.eclipse.ecf.remoteservice.sdk.feature" version="0.0.0"> + <category name="remoteservices"/> </feature> - <feature id="org.eclipse.ecf.discovery.zookeeper.feature.source" version="0.0.0"> - <category name="core sources"/> - </feature> - <feature id="org.eclipse.ecf.sharedobject.feature.source" version="0.0.0"> - <category name="core sources"/> - </feature> - <feature id="org.eclipse.ecf.provider.generic.feature.source" version="0.0.0"> - <category name="core sources"/> - </feature> - <feature id="org.eclipse.ecf.docshare.feature.source" version="0.0.0"> - <category name="core sources"/> - </feature> - <feature id="org.eclipse.ecf.datashare.feature.source" version="0.0.0"> - <category name="core sources"/> - </feature> - <feature id="org.eclipse.ecf.presence.feature.source" version="0.0.0"> - <category name="core sources"/> - </feature> - <feature id="org.eclipse.ecf.console.feature.source" version="0.0.0"> - <category name="core sources"/> - </feature> - <feature id="org.eclipse.ecf.provider.generic.datashare.feature.source" version="0.0.0"> - <category name="core sources"/> - </feature> - <feature id="org.eclipse.ecf.remoteservice.feature.source" version="0.0.0"> - <category name="core sources"/> - </feature> - <feature id="org.eclipse.ecf.osgi.services.feature.source" version="0.0.0"> - <category name="core sources"/> + <feature id="org.eclipse.ecf.remoteservice.sdk.feature.source" version="0.0.0"> + <category name="remoteservices"/> </feature> + <category-def name="sdk" label="ECF SDK for Eclipse"/> <category-def name="core" label="ECF Core Features"/> <category-def name="core sources" label="ECF Core Source Features"/> + <category-def name="remoteservices" label="ECF Remote Services SDK"/> </site> diff --git a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/pom.xml b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/pom.xml new file mode 100644 index 000000000..195ee061a --- /dev/null +++ b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.remoteservice.eventadmin</artifactId> + <version>1.2.100-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/server-side/bundles/org.eclipse.ecf.server.generic/pom.xml b/server-side/bundles/org.eclipse.ecf.server.generic/pom.xml new file mode 100644 index 000000000..61021faaf --- /dev/null +++ b/server-side/bundles/org.eclipse.ecf.server.generic/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.server.generic</artifactId> + <version>8.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/server-side/bundles/org.eclipse.ecf.server/pom.xml b/server-side/bundles/org.eclipse.ecf.server/pom.xml new file mode 100644 index 000000000..aea41550a --- /dev/null +++ b/server-side/bundles/org.eclipse.ecf.server/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.server</artifactId> + <version>2.1.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/server-side/features/org.eclipse.ecf.server.generic.feature/pom.xml b/server-side/features/org.eclipse.ecf.server.generic.feature/pom.xml new file mode 100644 index 000000000..fdcd3fec5 --- /dev/null +++ b/server-side/features/org.eclipse.ecf.server.generic.feature/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.server.generic.feature</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> +</project> diff --git a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/pom.xml b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/pom.xml new file mode 100644 index 000000000..f363421bc --- /dev/null +++ b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>ecf-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../</relativePath> + </parent> + <groupId>org.eclipse.ecf</groupId> + <artifactId>org.eclipse.ecf.remoteservices.tooling.pde</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> |