Skip to content

Commit

Permalink
Initial checkin for 3_15 branch. Removed zookeeper discovery provider
Browse files Browse the repository at this point in the history
and third party dependencies.  Removed httpclient 3.1 dependency (used
in test code).  Removed com.sun.syndication dependencies.   Removed jdom
dependencies.  Removed filetransfer test code.  Updated project set
files
  • Loading branch information
scottslewis committed Apr 2, 2024
1 parent 659c3fd commit a9b52eb
Show file tree
Hide file tree
Showing 50 changed files with 800 additions and 1,242 deletions.
2 changes: 0 additions & 2 deletions doc/bundles/org.eclipse.ecf.doc/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,11 @@ jars.extra.classpath = platform:/plugin/org.eclipse.ecf,\
platform:/plugin/org.eclipse.ecf.provider,\
platform:/plugin/org.eclipse.ecf.provider.dnssd,\
platform:/plugin/org.eclipse.ecf.provider.filetransfer,\
platform:/plugin/org.eclipse.ecf.provider.filetransfer.httpclient4,\
platform:/plugin/org.eclipse.ecf.provider.filetransfer.httpclient45,\
platform:/plugin/org.eclipse.ecf.provider.filetransfer.httpclient5,\
platform:/plugin/org.eclipse.ecf.provider.jslp,\
platform:/plugin/org.eclipse.ecf.provider.remoteservice,\
platform:/plugin/org.eclipse.ecf.provider.r_osgi,\
platform:/plugin/org.eclipse.ecf.provider.zookeeper,\
platform:/plugin/org.eclipse.ecf.remoteservice,\
platform:/plugin/org.eclipse.ecf.remoteservice.asyncproxy,\
platform:/plugin/org.eclipse.ecf.remoteservice.eventadmin,\
Expand Down
4 changes: 2 additions & 2 deletions doc/bundles/org.eclipse.ecf.doc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
<additionalArgument>-Xdoclint:none</additionalArgument>
<additionalArgument>-splitindex</additionalArgument>
<additionalArgument>-use</additionalArgument>
<additionalArgument>-doctitle "Eclipse Communication Framework (ECF) 3.14.41 API"</additionalArgument>
<additionalArgument>-windowtitle "Eclipse Communication Framework (ECF) 3.14.41 API"</additionalArgument>
<additionalArgument>-doctitle "Eclipse Communication Framework (ECF) 3.14.42 API"</additionalArgument>
<additionalArgument>-windowtitle "Eclipse Communication Framework (ECF) 3.14.42 API"</additionalArgument>
<additionalArgument>-link https://docs.oracle.com/en/java/javase/11/docs/api/</additionalArgument>
<additionalArgument>-link https://docs.osgi.org/javadoc/osgi.core/7.0.0/</additionalArgument>
<additionalArgument>-tag 'noimplement:a:Restriction:'</additionalArgument>
Expand Down
6 changes: 0 additions & 6 deletions doc/bundles/org.eclipse.ecf.doc/tocjavadoc.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
<topic href="html/reference/api/org/eclipse/ecf/provider/filetransfer/package-summary.html" label="org.eclipse.ecf.provider.filetransfer"/>
<topic href="html/reference/api/org/eclipse/ecf/provider/filetransfer/browse/package-summary.html" label="org.eclipse.ecf.provider.filetransfer.browse"/>
<topic href="html/reference/api/org/eclipse/ecf/provider/filetransfer/events/socket/package-summary.html" label="org.eclipse.ecf.provider.filetransfer.events.socket"/>
<topic href="html/reference/api/org/eclipse/ecf/provider/filetransfer/httpclient4/package-summary.html" label="org.eclipse.ecf.provider.filetransfer.httpclient4"/>
<topic href="html/reference/api/org/eclipse/ecf/provider/filetransfer/httpclient45/package-summary.html" label="org.eclipse.ecf.provider.filetransfer.httpclient45"/>
<topic href="html/reference/api/org/eclipse/ecf/provider/filetransfer/httpclient5/package-summary.html" label="org.eclipse.ecf.provider.filetransfer.httpclient5"/>
<topic href="html/reference/api/org/eclipse/ecf/provider/filetransfer/identity/package-summary.html" label="org.eclipse.ecf.provider.filetransfer.identity"/>
Expand All @@ -49,9 +48,6 @@
<topic href="html/reference/api/org/eclipse/ecf/provider/r_osgi/identity/package-summary.html" label="org.eclipse.ecf.provider.r_osgi.identity"/>
<topic href="html/reference/api/org/eclipse/ecf/provider/remoteservice/generic/package-summary.html" label="org.eclipse.ecf.provider.remoteservice.generic"/>
<topic href="html/reference/api/org/eclipse/ecf/provider/util/package-summary.html" label="org.eclipse.ecf.provider.util"/>
<topic href="html/reference/api/org/eclipse/ecf/provider/zookeeper/package-summary.html" label="org.eclipse.ecf.provider.zookeeper"/>
<topic href="html/reference/api/org/eclipse/ecf/provider/zookeeper/core/package-summary.html" label="org.eclipse.ecf.provider.zookeeper.core"/>
<topic href="html/reference/api/org/eclipse/ecf/provider/zookeeper/util/package-summary.html" label="org.eclipse.ecf.provider.zookeeper.util"/>
<topic href="html/reference/api/org/eclipse/ecf/remoteservice/package-summary.html" label="org.eclipse.ecf.remoteservice"/>
<topic href="html/reference/api/org/eclipse/ecf/remoteservice/asyncproxy/package-summary.html" label="org.eclipse.ecf.remoteservice.asyncproxy"/>
<topic href="html/reference/api/org/eclipse/ecf/remoteservice/client/package-summary.html" label="org.eclipse.ecf.remoteservice.client"/>
Expand All @@ -66,8 +62,6 @@
<topic href="html/reference/api/org/eclipse/ecf/remoteservice/servlet/package-summary.html" label="org.eclipse.ecf.remoteservice.servlet"/>
<topic href="html/reference/api/org/eclipse/ecf/remoteservice/util/package-summary.html" label="org.eclipse.ecf.remoteservice.util"/>
<topic href="html/reference/api/org/eclipse/ecf/remoteservice/util/tracker/package-summary.html" label="org.eclipse.ecf.remoteservice.util.tracker"/>
<topic href="html/reference/api/org/eclipse/ecf/remoteservices/tooling/package-summary.html" label="org.eclipse.ecf.remoteservice.tooling"/>
<topic href="html/reference/api/org/eclipse/ecf/remoteservices/tooling/package-summary.html" label="org.eclipse.ecf.remoteservice.tooling"/>
<topic href="html/reference/api/org/osgi/service/remoteserviceadmin/package-summary.html" label="org.osgi.service.remoteserviceadmin"/>
<topic href="html/reference/api/org/osgi/service/remoteserviceadmin/namespace/package-summary.html" label="org.osgi.service.remoteserviceadmin.namespace"/>
</topic>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-SymbolicName: org.eclipse.ecf.examples.remoteservices.hello.consumer;singleton:=true
Automatic-Module-Name: org.eclipse.ecf.examples.remoteservices.hello.consumer
Bundle-Version: 3.0.200.qualifier
Bundle-Version: 3.0.300.qualifier
Bundle-Activator: org.eclipse.ecf.internal.examples.remoteservices.hello.consumer.Activator
Bundle-Vendor: %bundleProvider
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.ecf</groupId>
<artifactId>org.eclipse.ecf.examples.remoteservices.hello.consumer</artifactId>
<version>3.0.200-SNAPSHOT</version>
<version>3.0.300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-SymbolicName: org.eclipse.ecf.examples.remoteservices.hello.host;singleton:=true
Automatic-Module-Name: org.eclipse.ecf.examples.remoteservices.hello.host
Bundle-Version: 3.1.102.qualifier
Bundle-Version: 3.1.103.qualifier
Bundle-Activator: org.eclipse.ecf.internal.examples.remoteservices.hello.host.Activator
Bundle-Vendor: %bundleProvider
Bundle-RequiredExecutionEnvironment: J2SE-1.5,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.ecf</groupId>
<artifactId>org.eclipse.ecf.examples.remoteservices.hello.host</artifactId>
<version>3.1.102-SNAPSHOT</version>
<version>3.1.103-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>

This file was deleted.

This file was deleted.

0 comments on commit a9b52eb

Please sign in to comment.