diff options
| author | Eike Stepper | 2011-06-07 10:31:42 +0000 |
|---|---|---|
| committer | Eike Stepper | 2011-06-07 10:31:42 +0000 |
| commit | d057d2e97e0c9807a1e0f5dc533040f64430fbda (patch) | |
| tree | 50b158430a1617c51b19c109fa54fe84437ae30a | |
| parent | 8103765e7770ca0e5aa4ad27c4d57a1933356de2 (diff) | |
| download | cdo-d057d2e97e0c9807a1e0f5dc533040f64430fbda.tar.gz cdo-d057d2e97e0c9807a1e0f5dc533040f64430fbda.tar.xz cdo-d057d2e97e0c9807a1e0f5dc533040f64430fbda.zip | |
58 files changed, 751 insertions, 16 deletions
diff --git a/features/org.eclipse.net4j.db.doc-feature/.project b/features/org.eclipse.net4j.db.doc-feature/.project new file mode 100644 index 0000000000..d43326ec22 --- /dev/null +++ b/features/org.eclipse.net4j.db.doc-feature/.project @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.net4j.db.doc-feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + </natures> +</projectDescription> diff --git a/features/org.eclipse.net4j.db.doc-feature/.settings/org.eclipse.ltk.core.refactoring.prefs b/features/org.eclipse.net4j.db.doc-feature/.settings/org.eclipse.ltk.core.refactoring.prefs new file mode 100644 index 0000000000..0779a3c947 --- /dev/null +++ b/features/org.eclipse.net4j.db.doc-feature/.settings/org.eclipse.ltk.core.refactoring.prefs @@ -0,0 +1,3 @@ +#Thu Feb 04 10:06:10 CET 2010 +eclipse.preferences.version=1 +org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false diff --git a/features/org.eclipse.net4j.db.doc-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs b/features/org.eclipse.net4j.db.doc-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs new file mode 100644 index 0000000000..d573634502 --- /dev/null +++ b/features/org.eclipse.net4j.db.doc-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs @@ -0,0 +1,4 @@ +#Thu Feb 04 10:06:10 CET 2010 +eclipse.preferences.version=1 +project.repository.kind=bugzilla +project.repository.url=https\://bugs.eclipse.org/bugs diff --git a/features/org.eclipse.net4j.db.doc-feature/.settings/org.eclipse.mylyn.team.ui.prefs b/features/org.eclipse.net4j.db.doc-feature/.settings/org.eclipse.mylyn.team.ui.prefs new file mode 100644 index 0000000000..4d86eb45ba --- /dev/null +++ b/features/org.eclipse.net4j.db.doc-feature/.settings/org.eclipse.mylyn.team.ui.prefs @@ -0,0 +1,3 @@ +#Thu Feb 04 10:06:10 CET 2010 +commit.comment.template=[${task.id}] ${task.description} \r\n${task.url} +eclipse.preferences.version=1 diff --git a/features/org.eclipse.net4j.db.doc-feature/build.properties b/features/org.eclipse.net4j.db.doc-feature/build.properties new file mode 100644 index 0000000000..8bf0ed342c --- /dev/null +++ b/features/org.eclipse.net4j.db.doc-feature/build.properties @@ -0,0 +1,13 @@ +# Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# Eike Stepper - initial API and implementation + +# NLS_MESSAGEFORMAT_VAR + +bin.includes = feature.xml,\ + feature.properties diff --git a/features/org.eclipse.net4j.db.doc-feature/feature.properties b/features/org.eclipse.net4j.db.doc-feature/feature.properties new file mode 100644 index 0000000000..49e963df09 --- /dev/null +++ b/features/org.eclipse.net4j.db.doc-feature/feature.properties @@ -0,0 +1,8 @@ +# Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html + +featureName = Net4j DB Framework Documentation +description = Contains the documentation of the Net4j DB Framework. diff --git a/features/org.eclipse.net4j.db.doc-feature/feature.xml b/features/org.eclipse.net4j.db.doc-feature/feature.xml new file mode 100644 index 0000000000..0f19c83bc5 --- /dev/null +++ b/features/org.eclipse.net4j.db.doc-feature/feature.xml @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.html + + Contributors: + Eike Stepper - initial API and implementation +--> +<feature + id="org.eclipse.net4j.db.doc" + label="%featureName" + version="4.0.0.qualifier" + provider-name="%providerName" + image="eclipse_update_120.jpg" license-feature="org.eclipse.emf.cdo.license" license-feature-version="4.0.0.qualifier"> + + <description> + %description + </description> + + <copyright url="%copyrightURL"> + %copyright + </copyright> + + <license url="%licenseURL"> + %license + </license> + + <url> + <update label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/> + <discovery label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/> + </url> + + <requires> + <import plugin="org.eclipse.help" version="3.3.0" match="compatible"/> + </requires> + + <plugin + id="org.eclipse.net4j.doc" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + +</feature> diff --git a/features/org.eclipse.net4j.doc-feature/feature.properties b/features/org.eclipse.net4j.doc-feature/feature.properties index 2f4f518851..1e70dfac84 100644 --- a/features/org.eclipse.net4j.doc-feature/feature.properties +++ b/features/org.eclipse.net4j.doc-feature/feature.properties @@ -4,5 +4,5 @@ # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-v10.html -featureName = Net4j Documentation -description = Contains the documentation of the Net4j SDK. +featureName = Net4j Signalling Platform Documentation +description = Contains the documentation of the Net4j Signalling Platform. diff --git a/features/org.eclipse.net4j.sdk-feature/feature.xml b/features/org.eclipse.net4j.sdk-feature/feature.xml index 784200bfad..2c71616f58 100644 --- a/features/org.eclipse.net4j.sdk-feature/feature.xml +++ b/features/org.eclipse.net4j.sdk-feature/feature.xml @@ -54,6 +54,14 @@ version="0.0.0"/> <includes + id="org.eclipse.net4j.util.doc" + version="0.0.0"/> + + <includes + id="org.eclipse.net4j.db.doc" + version="0.0.0"/> + + <includes id="org.eclipse.net4j.sdk.source" version="0.0.0"/> diff --git a/features/org.eclipse.net4j.util.doc-feature/.project b/features/org.eclipse.net4j.util.doc-feature/.project new file mode 100644 index 0000000000..e87f864e64 --- /dev/null +++ b/features/org.eclipse.net4j.util.doc-feature/.project @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.net4j.util.doc-feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + </natures> +</projectDescription> diff --git a/features/org.eclipse.net4j.util.doc-feature/.settings/org.eclipse.ltk.core.refactoring.prefs b/features/org.eclipse.net4j.util.doc-feature/.settings/org.eclipse.ltk.core.refactoring.prefs new file mode 100644 index 0000000000..0779a3c947 --- /dev/null +++ b/features/org.eclipse.net4j.util.doc-feature/.settings/org.eclipse.ltk.core.refactoring.prefs @@ -0,0 +1,3 @@ +#Thu Feb 04 10:06:10 CET 2010 +eclipse.preferences.version=1 +org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false diff --git a/features/org.eclipse.net4j.util.doc-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs b/features/org.eclipse.net4j.util.doc-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs new file mode 100644 index 0000000000..d573634502 --- /dev/null +++ b/features/org.eclipse.net4j.util.doc-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs @@ -0,0 +1,4 @@ +#Thu Feb 04 10:06:10 CET 2010 +eclipse.preferences.version=1 +project.repository.kind=bugzilla +project.repository.url=https\://bugs.eclipse.org/bugs diff --git a/features/org.eclipse.net4j.util.doc-feature/.settings/org.eclipse.mylyn.team.ui.prefs b/features/org.eclipse.net4j.util.doc-feature/.settings/org.eclipse.mylyn.team.ui.prefs new file mode 100644 index 0000000000..4d86eb45ba --- /dev/null +++ b/features/org.eclipse.net4j.util.doc-feature/.settings/org.eclipse.mylyn.team.ui.prefs @@ -0,0 +1,3 @@ +#Thu Feb 04 10:06:10 CET 2010 +commit.comment.template=[${task.id}] ${task.description} \r\n${task.url} +eclipse.preferences.version=1 diff --git a/features/org.eclipse.net4j.util.doc-feature/build.properties b/features/org.eclipse.net4j.util.doc-feature/build.properties new file mode 100644 index 0000000000..8bf0ed342c --- /dev/null +++ b/features/org.eclipse.net4j.util.doc-feature/build.properties @@ -0,0 +1,13 @@ +# Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# Eike Stepper - initial API and implementation + +# NLS_MESSAGEFORMAT_VAR + +bin.includes = feature.xml,\ + feature.properties diff --git a/features/org.eclipse.net4j.util.doc-feature/feature.properties b/features/org.eclipse.net4j.util.doc-feature/feature.properties new file mode 100644 index 0000000000..52edfa69fa --- /dev/null +++ b/features/org.eclipse.net4j.util.doc-feature/feature.properties @@ -0,0 +1,8 @@ +# Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html + +featureName = Net4j Utilities Documentation +description = Contains the documentation of the Net4j Utilities. diff --git a/features/org.eclipse.net4j.util.doc-feature/feature.xml b/features/org.eclipse.net4j.util.doc-feature/feature.xml new file mode 100644 index 0000000000..1d5b5eff7f --- /dev/null +++ b/features/org.eclipse.net4j.util.doc-feature/feature.xml @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.html + + Contributors: + Eike Stepper - initial API and implementation +--> +<feature + id="org.eclipse.net4j.util.doc" + label="%featureName" + version="4.0.0.qualifier" + provider-name="%providerName" + image="eclipse_update_120.jpg" license-feature="org.eclipse.emf.cdo.license" license-feature-version="4.0.0.qualifier"> + + <description> + %description + </description> + + <copyright url="%copyrightURL"> + %copyright + </copyright> + + <license url="%licenseURL"> + %license + </license> + + <url> + <update label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/> + <discovery label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/> + </url> + + <requires> + <import plugin="org.eclipse.help" version="3.3.0" match="compatible"/> + </requires> + + <plugin + id="org.eclipse.net4j.doc" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + +</feature> diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/build.properties b/plugins/org.eclipse.emf.cdo.ui.ide/build.properties index 3d155179c0..793eb58d6c 100644 --- a/plugins/org.eclipse.emf.cdo.ui.ide/build.properties +++ b/plugins/org.eclipse.emf.cdo.ui.ide/build.properties @@ -23,3 +23,5 @@ output.. = bin/ src.includes = about.html,\ copyright.txt,\ IDE.launch + +org.eclipse.emf.cdo.releng.javadoc.project = org.eclipse.emf.cdo.doc diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/ide/package.html b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/ide/package.html new file mode 100644 index 0000000000..96e3571dbe --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/ide/package.html @@ -0,0 +1,23 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> +<html> +<head> +<!-- + + Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.html + + Contributors: + Eike Stepper - initial API and implementation + +--> +</head> +<body bgcolor="white"> + +Reusable UI IDE components specific to the CDO Model Repository. +<p> + +</body> +</html> diff --git a/plugins/org.eclipse.emf.cdo.ui/build.properties b/plugins/org.eclipse.emf.cdo.ui/build.properties index 031e2268da..e3c7dabe89 100644 --- a/plugins/org.eclipse.emf.cdo.ui/build.properties +++ b/plugins/org.eclipse.emf.cdo.ui/build.properties @@ -23,3 +23,5 @@ src.includes = about.html,\ copyright.txt,\ CDOClient1.launch,\ CDOClient2.launch + +org.eclipse.emf.cdo.releng.javadoc.project = org.eclipse.emf.cdo.doc diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/package.html b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/package.html new file mode 100644 index 0000000000..b1ab84c830 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/package.html @@ -0,0 +1,23 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> +<html> +<head> +<!-- + + Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.html + + Contributors: + Eike Stepper - initial API and implementation + +--> +</head> +<body bgcolor="white"> + +Reusable UI components specific to the CDO Model Repository. +<p> + +</body> +</html> diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/package.html b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/package.html new file mode 100644 index 0000000000..3d163c221c --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/package.html @@ -0,0 +1,23 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> +<html> +<head> +<!-- + + Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.html + + Contributors: + Eike Stepper - initial API and implementation + +--> +</head> +<body bgcolor="white"> + +A library with reusable widgets. +<p> + +</body> +</html> diff --git a/plugins/org.eclipse.net4j.db.derby/build.properties b/plugins/org.eclipse.net4j.db.derby/build.properties index 661e648a4d..0873081fed 100644 --- a/plugins/org.eclipse.net4j.db.derby/build.properties +++ b/plugins/org.eclipse.net4j.db.derby/build.properties @@ -26,3 +26,5 @@ bin.includes = META-INF/,\ modeling32.png src.includes = about.html,\ copyright.txt + +org.eclipse.emf.cdo.releng.javadoc.project = org.eclipse.net4j.db.doc diff --git a/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/derby/package.html b/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/derby/package.html new file mode 100644 index 0000000000..48e06df0ef --- /dev/null +++ b/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/derby/package.html @@ -0,0 +1,23 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> +<html> +<head> +<!-- + + Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.html + + Contributors: + Eike Stepper - initial API and implementation + +--> +</head> +<body bgcolor="white"> + +The Net4j DB Framework support for Derby databases. +<p> + +</body> +</html> diff --git a/plugins/org.eclipse.net4j.db.h2/build.properties b/plugins/org.eclipse.net4j.db.h2/build.properties index 5d1b29ce0d..5515d93281 100644 --- a/plugins/org.eclipse.net4j.db.h2/build.properties +++ b/plugins/org.eclipse.net4j.db.h2/build.properties @@ -24,3 +24,5 @@ bin.includes = META-INF/,\ modeling32.png src.includes = about.html,\ copyright.txt + +org.eclipse.emf.cdo.releng.javadoc.project = org.eclipse.net4j.db.doc diff --git a/plugins/org.eclipse.net4j.db.h2/src/org/eclipse/net4j/db/h2/package.html b/plugins/org.eclipse.net4j.db.h2/src/org/eclipse/net4j/db/h2/package.html new file mode 100644 index 0000000000..a8530c8860 --- /dev/null +++ b/plugins/org.eclipse.net4j.db.h2/src/org/eclipse/net4j/db/h2/package.html @@ -0,0 +1,23 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> +<html> +<head> +<!-- + + Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.html + + Contributors: + Eike Stepper - initial API and implementation + +--> +</head> +<body bgcolor="white"> + +The Net4j DB Framework support for H2 databases. +<p> + +</body> +</html> diff --git a/plugins/org.eclipse.net4j.db.hsqldb/build.properties b/plugins/org.eclipse.net4j.db.hsqldb/build.properties index 5d1b29ce0d..5515d93281 100644 --- a/plugins/org.eclipse.net4j.db.hsqldb/build.properties +++ b/plugins/org.eclipse.net4j.db.hsqldb/build.properties @@ -24,3 +24,5 @@ bin.includes = META-INF/,\ modeling32.png src.includes = about.html,\ copyright.txt + +org.eclipse.emf.cdo.releng.javadoc.project = org.eclipse.net4j.db.doc diff --git a/plugins/org.eclipse.net4j.db.hsqldb/src/org/eclipse/net4j/db/hsqldb/package.html b/plugins/org.eclipse.net4j.db.hsqldb/src/org/eclipse/net4j/db/hsqldb/package.html new file mode 100644 index 0000000000..ed6f59ce9f --- /dev/null +++ b/plugins/org.eclipse.net4j.db.hsqldb/src/org/eclipse/net4j/db/hsqldb/package.html @@ -0,0 +1,23 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> +<html> +<head> +<!-- + + Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.html + + Contributors: + Eike Stepper - initial API and implementation + +--> +</head> +<body bgcolor="white"> + +The Net4j DB Framework support for HSQLDB databases. +<p> + +</body> +</html> diff --git a/plugins/org.eclipse.net4j.db.mysql/build.properties b/plugins/org.eclipse.net4j.db.mysql/build.properties index 5d1b29ce0d..5515d93281 100644 --- a/plugins/org.eclipse.net4j.db.mysql/build.properties +++ b/plugins/org.eclipse.net4j.db.mysql/build.properties @@ -24,3 +24,5 @@ bin.includes = META-INF/,\ modeling32.png src.includes = about.html,\ copyright.txt + +org.eclipse.emf.cdo.releng.javadoc.project = org.eclipse.net4j.db.doc diff --git a/plugins/org.eclipse.net4j.db.mysql/src/org/eclipse/net4j/db/mysql/package.html b/plugins/org.eclipse.net4j.db.mysql/src/org/eclipse/net4j/db/mysql/package.html new file mode 100644 index 0000000000..ebfa5ff412 --- /dev/null +++ b/plugins/org.eclipse.net4j.db.mysql/src/org/eclipse/net4j/db/mysql/package.html @@ -0,0 +1,23 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> +<html> +<head> +<!-- + + Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.html + + Contributors: + Eike Stepper - initial API and implementation + +--> +</head> +<body bgcolor="white"> + +The Net4j DB Framework support for MYSQL databases. +<p> + +</body> +</html> diff --git a/plugins/org.eclipse.net4j.db.postgresql/build.properties b/plugins/org.eclipse.net4j.db.postgresql/build.properties index 9c0ef36c2b..942b9d9fdc 100644 --- a/plugins/org.eclipse.net4j.db.postgresql/build.properties +++ b/plugins/org.eclipse.net4j.db.postgresql/build.properties @@ -24,3 +24,5 @@ bin.includes = META-INF/,\ modeling32.png src.includes = about.html,\ copyright.txt + +org.eclipse.emf.cdo.releng.javadoc.project = org.eclipse.net4j.db.doc diff --git a/plugins/org.eclipse.net4j.db.postgresql/src/org/eclipse/net4j/db/postgresql/package.html b/plugins/org.eclipse.net4j.db.postgresql/src/org/eclipse/net4j/db/postgresql/package.html new file mode 100644 index 0000000000..3ecd5e5e9d --- /dev/null +++ b/plugins/org.eclipse.net4j.db.postgresql/src/org/eclipse/net4j/db/postgresql/package.html @@ -0,0 +1,23 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> +<html> +<head> +<!-- + + Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.html + + Contributors: + Eike Stepper - initial API and implementation + +--> +</head> +<body bgcolor="white"> + +The Net4j DB Framework support for PostgreSQL databases. +<p> + +</body> +</html> diff --git a/plugins/org.eclipse.net4j.db/build.properties b/plugins/org.eclipse.net4j.db/build.properties index d7f3729923..ad3dc57ee3 100644 --- a/plugins/org.eclipse.net4j.db/build.properties +++ b/plugins/org.eclipse.net4j.db/build.properties @@ -26,4 +26,4 @@ bin.includes = META-INF/,\ src.includes = about.html,\ copyright.txt -org.eclipse.emf.cdo.releng.javadoc.project = org.eclipse.net4j.doc +org.eclipse.emf.cdo.releng.javadoc.project = org.eclipse.net4j.db.doc diff --git a/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF index 9062127dda..805a650284 100644 --- a/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF @@ -13,8 +13,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.net4j.util.ui;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, org.eclipse.net4j.ui.shared;bundle-version="[4.0.0,5.0.0)" -Export-Package: org.eclipse.net4j.internal.ui;version="4.0.0";x-friends:="org.eclipse.net4j.ui.defs", +Export-Package: org.eclipse.net4j.ui;version="4.0.0", org.eclipse.net4j.internal.ui.bundle;version="4.0.0";x-internal:=true, - org.eclipse.net4j.internal.ui.container;version="4.0.0", + org.eclipse.net4j.internal.ui.container;version="4.0.0";x-internal:=true, org.eclipse.net4j.internal.ui.messages;version="4.0.0";x-internal:=true, org.eclipse.net4j.internal.ui.views;version="4.0.0";x-friends:="org.eclipse.net4j.ui.defs" diff --git a/plugins/org.eclipse.net4j.ui/build.properties b/plugins/org.eclipse.net4j.ui/build.properties index 1e2e2db0be..b33bde9bf5 100644 --- a/plugins/org.eclipse.net4j.ui/build.properties +++ b/plugins/org.eclipse.net4j.ui/build.properties @@ -24,3 +24,5 @@ bin.includes = META-INF/,\ modeling32.png src.includes = about.html,\ copyright.txt + +org.eclipse.emf.cdo.releng.javadoc.project = org.eclipse.net4j.doc diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/AcceptorContentProvider.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/AcceptorContentProvider.java index b5466eca62..1c4ea59300 100644 --- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/AcceptorContentProvider.java +++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/AcceptorContentProvider.java @@ -8,15 +8,19 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.net4j.internal.ui; +package org.eclipse.net4j.ui; +import org.eclipse.net4j.acceptor.IAcceptor; import org.eclipse.net4j.util.container.IManagedContainer; import org.eclipse.net4j.util.ui.StructuredContentProvider; import org.eclipse.spi.net4j.AcceptorFactory; /** + * A {@link StructuredContentProvider structured content provider} that shows {@link IAcceptor acceptors}. + * * @author Eike Stepper + * @since 4.0 */ public class AcceptorContentProvider extends StructuredContentProvider<IManagedContainer> { diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/ConnectorContentProvider.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/ConnectorContentProvider.java index 3acb33c541..0cad41ba65 100644 --- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/ConnectorContentProvider.java +++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/ConnectorContentProvider.java @@ -8,15 +8,19 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.net4j.internal.ui; +package org.eclipse.net4j.ui; +import org.eclipse.net4j.connector.IConnector; import org.eclipse.net4j.util.container.IManagedContainer; import org.eclipse.net4j.util.ui.StructuredContentProvider; import org.eclipse.spi.net4j.ConnectorFactory; /** + * A {@link StructuredContentProvider structured content provider} that shows {@link IConnector connectors}. + * * @author Eike Stepper + * @since 4.0 */ public class ConnectorContentProvider extends StructuredContentProvider<IManagedContainer> { diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/FactoryTypeContentProvider.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/FactoryTypeContentProvider.java index 474887d8fe..9960ecbc66 100644 --- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/FactoryTypeContentProvider.java +++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/FactoryTypeContentProvider.java @@ -8,13 +8,18 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.net4j.internal.ui; +package org.eclipse.net4j.ui; import org.eclipse.net4j.util.container.IManagedContainer; +import org.eclipse.net4j.util.factory.IFactoryKey; import org.eclipse.net4j.util.ui.StructuredContentProvider; /** + * A {@link StructuredContentProvider structured content provider} that shows the {@link IFactoryKey#getType() factory + * types} of the {@link #getInput() input}. + * * @author Eike Stepper + * @since 4.0 */ public class FactoryTypeContentProvider extends StructuredContentProvider<IManagedContainer> { diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/package.html b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/package.html new file mode 100644 index 0000000000..46480b1e1c --- /dev/null +++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/package.html @@ -0,0 +1,23 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> +<html> +<head> +<!-- + + Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.html + + Contributors: + Eike Stepper - initial API and implementation + +--> +</head> +<body bgcolor="white"> + +Reusable UI components specific to the Net4j Signalling Platform. +<p> + +</body> +</html> diff --git a/plugins/org.eclipse.net4j.util.defs/plugin.properties b/plugins/org.eclipse.net4j.util.defs/plugin.properties index 12d49b3fbf..4903b76782 100644 --- a/plugins/org.eclipse.net4j.util.defs/plugin.properties +++ b/plugins/org.eclipse.net4j.util.defs/plugin.properties @@ -7,5 +7,5 @@ # Contributors: # Eike Stepper - initial API and implementation -pluginName = Net4j Signalling Platform Utilities Definitions +pluginName = Net4j Utilities Definitions providerName = Eclipse Modeling Project diff --git a/plugins/org.eclipse.net4j.util.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.util.ui/META-INF/MANIFEST.MF index e5f40bdccb..7809bb7293 100644 --- a/plugins/org.eclipse.net4j.util.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.util.ui/META-INF/MANIFEST.MF @@ -21,7 +21,6 @@ Export-Package: org.eclipse.net4j.util.internal.ui;version="3.1.0";x-internal:=t org.eclipse.net4j.util.ui;version="3.1.0", org.eclipse.net4j.util.ui.actions;version="3.1.0", org.eclipse.net4j.util.ui.container;version="3.1.0", - org.eclipse.net4j.util.ui.container.examples;version="3.1.0";x-internal:=true, org.eclipse.net4j.util.ui.dnd;version="3.1.0", org.eclipse.net4j.util.ui.prefs;version="3.1.0", org.eclipse.net4j.util.ui.proposals;version="3.1.0", diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/examples/Snippet1.java b/plugins/org.eclipse.net4j.util.ui/Snippet1.java index 0cd30d3e3a..0cd30d3e3a 100644 --- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/examples/Snippet1.java +++ b/plugins/org.eclipse.net4j.util.ui/Snippet1.java diff --git a/plugins/org.eclipse.net4j.util.ui/build.properties b/plugins/org.eclipse.net4j.util.ui/build.properties index 7aaa05eb68..60cb9eb478 100644 --- a/plugins/org.eclipse.net4j.util.ui/build.properties +++ b/plugins/org.eclipse.net4j.util.ui/build.properties @@ -20,3 +20,5 @@ bin.includes = META-INF/,\ plugin.xml src.includes = about.html,\ copyright.txt + +org.eclipse.emf.cdo.releng.javadoc.project = org.eclipse.net4j.util.doc diff --git a/plugins/org.eclipse.net4j.util.ui/plugin.properties b/plugins/org.eclipse.net4j.util.ui/plugin.properties index d0dc54f5a1..e90cde7863 100644 --- a/plugins/org.eclipse.net4j.util.ui/plugin.properties +++ b/plugins/org.eclipse.net4j.util.ui/plugin.properties @@ -7,7 +7,7 @@ # Contributors: # Eike Stepper - initial API and implementation -pluginName = Net4j Signalling Platform Utilities UI +pluginName = Net4j Utilities UI providerName = Eclipse Modeling Project category.name = Net4j Debug diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/package.html b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/package.html new file mode 100644 index 0000000000..59a7474948 --- /dev/null +++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/package.html @@ -0,0 +1,23 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> +<html> +<head> +<!-- + + Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.html + + Contributors: + Eike Stepper - initial API and implementation + +--> +</head> +<body bgcolor="white"> + +Reusable actions and action delegates. +<p> + +</body> +</html> diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/package.html b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/package.html new file mode 100644 index 0000000000..1ecf46ee8f --- /dev/null +++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/package.html @@ -0,0 +1,23 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> +<html> +<head> +<!-- + + Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.html + + Contributors: + Eike Stepper - initial API and implementation + +--> +</head> +<body bgcolor="white"> + +An element wizard framework for managed containers. +<p> + +</body> +</html> diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/dnd/package.html b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/dnd/package.html new file mode 100644 index 0000000000..d9f19ff1a6 --- /dev/null +++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/dnd/package.html @@ -0,0 +1,23 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> +<html> +<head> +<!-- + + Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.html + + Contributors: + Eike Stepper - initial API and implementation + +--> +</head> +<body bgcolor="white"> + +Helpers for drag and drop support. +<p> + +</body> +</html> diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/package.html b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/package.html new file mode 100644 index 0000000000..7289250b19 --- /dev/null +++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/package.html @@ -0,0 +1,23 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> +<html> +<head> +<!-- + + Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.html + + Contributors: + Eike Stepper - initial API and implementation + +--> +</head> +<body bgcolor="white"> + +Reusable UI components. +<p> + +</body> +</html> diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/prefs/package.html b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/prefs/package.html new file mode 100644 index 0000000000..517fa25764 --- /dev/null +++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/prefs/package.html @@ -0,0 +1,23 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> +<html> +<head> +<!-- + + Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.html + + Contributors: + Eike Stepper - initial API and implementation + +--> +</head> +<body bgcolor="white"> + +Helpers for O&M based preference pages. +<p> + +</body> +</html> diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/proposals/package.html b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/proposals/package.html new file mode 100644 index 0000000000..90b5da0944 --- /dev/null +++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/proposals/package.html @@ -0,0 +1,23 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> +<html> +<head> +<!-- + + Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.html + + Contributors: + Eike Stepper - initial API and implementation + +--> +</head> +<body bgcolor="white"> + +Copied from org.eclipse.ui.texteditor. +<p> + +</body> +</html> diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/security/package.html b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/security/package.html new file mode 100644 index 0000000000..47bd67967c --- /dev/null +++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/security/package.html @@ -0,0 +1,23 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> +<html> +<head> +<!-- + + Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.html + + Contributors: + Eike Stepper - initial API and implementation + +--> +</head> +<body bgcolor="white"> + +Credentials dialogs. +<p> + +</body> +</html> diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/package.html b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/package.html new file mode 100644 index 0000000000..6c01a11849 --- /dev/null +++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/package.html @@ -0,0 +1,23 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> +<html> +<head> +<!-- + + Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.html + + Contributors: + Eike Stepper - initial API and implementation + +--> +</head> +<body bgcolor="white"> + +Helpers for Eclipse view parts. +<p> + +</body> +</html> diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/package.html b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/package.html new file mode 100644 index 0000000000..3d163c221c --- /dev/null +++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/package.html @@ -0,0 +1,23 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> +<html> +<head> +<!-- + + Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.html + + Contributors: + Eike Stepper - initial API and implementation + +--> +</head> +<body bgcolor="white"> + +A library with reusable widgets. +<p> + +</body> +</html> diff --git a/plugins/org.eclipse.net4j.util/build.properties b/plugins/org.eclipse.net4j.util/build.properties index 3dbcae5e72..71aac7a56e 100644 --- a/plugins/org.eclipse.net4j.util/build.properties +++ b/plugins/org.eclipse.net4j.util/build.properties @@ -22,4 +22,4 @@ bin.includes = META-INF/,\ src.includes = about.html,\ copyright.txt -org.eclipse.emf.cdo.releng.javadoc.project = org.eclipse.net4j.doc +org.eclipse.emf.cdo.releng.javadoc.project = org.eclipse.net4j.util.doc diff --git a/plugins/org.eclipse.net4j.util/plugin.properties b/plugins/org.eclipse.net4j.util/plugin.properties index bd82ca3d36..53a57f2b9a 100644 --- a/plugins/org.eclipse.net4j.util/plugin.properties +++ b/plugins/org.eclipse.net4j.util/plugin.properties @@ -7,7 +7,7 @@ # Contributors: # Eike Stepper - initial API and implementation -pluginName = Net4j Signalling Platform Utilities +pluginName = Net4j Utilities providerName = Eclipse Modeling Project extension-point.name = Factories diff --git a/releng/org.eclipse.emf.cdo.releng/CDO Generate JavaDocs.launch b/releng/org.eclipse.emf.cdo.releng/CDO Generate JavaDocs.launch index f6716bc6d4..d48c4aa352 100644 --- a/releng/org.eclipse.emf.cdo.releng/CDO Generate JavaDocs.launch +++ b/releng/org.eclipse.emf.cdo.releng/CDO Generate JavaDocs.launch @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.emf.cdo.doc" type="4"/> <item path="/org.eclipse.emf.cdo.releng" type="4"/> <item path="/org.eclipse.net4j.doc" type="4"/> </resources>}"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${workspace}"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/org.eclipse.emf.cdo.releng/javadoc.ant"/>
</listAttribute>
diff --git a/releng/org.eclipse.emf.cdo.releng/javadocLib.ant b/releng/org.eclipse.emf.cdo.releng/javadocLib.ant index 99e878d972..3903a3b269 100644 --- a/releng/org.eclipse.emf.cdo.releng/javadocLib.ant +++ b/releng/org.eclipse.emf.cdo.releng/javadocLib.ant @@ -2,6 +2,8 @@ <project name="JavaDocLib" default="delegate" basedir=".."> <target name="delegate"> + <ant antfile="plugins/org.eclipse.net4j.util.doc/javadoc.ant" target="${delegate.target}" /> + <ant antfile="plugins/org.eclipse.net4j.db.doc/javadoc.ant" target="${delegate.target}" /> <ant antfile="plugins/org.eclipse.net4j.doc/javadoc.ant" target="${delegate.target}" /> <ant antfile="plugins/org.eclipse.emf.cdo.doc/javadoc.ant" target="${delegate.target}" /> </target> diff --git a/releng/org.eclipse.emf.cdo.releng/javadocTemplate.ant b/releng/org.eclipse.emf.cdo.releng/javadocTemplate.ant new file mode 100644 index 0000000000..add02755e9 --- /dev/null +++ b/releng/org.eclipse.emf.cdo.releng/javadocTemplate.ant @@ -0,0 +1,87 @@ +<?xml version="1.0"?> +<project name="JavaDoc" default="build.clean" basedir="../.."> + + <property name="javadoc.project" value="plugins/${PROJECT-NAME}" /> + <property file="${javadoc.project}/plugin.properties" /> + <property name="javadoc.name" value="${pluginName}" /> + <property name="destdir" value="${javadoc.project}/javadoc" /> + + <path id="javadoc.classpath"> + <fileset dir="_target/plugins"> + <include name="**/*.jar" /> + </fileset> + <fileset dir="plugins"> + <include name="**/*.jar" /> + </fileset> + <dirset dir="plugins"> + <include name="*/bin" /> + </dirset> + </path> + + <fileset dir="${destdir}" id="desthtml"> + <include name="**/*.html" /> + </fileset> + + <target name="clean"> + <delete includeemptydirs="true"> + <fileset dir="${destdir}" defaultexcludes="true"> + <include name="**/*" /> + </fileset> + </delete> + </target> + + <target name="build"> + <javadoc destdir="${destdir}" + Encoding="ISO-8859-1" + classpathref="javadoc.classpath" + maxmemory="1024m" + source="1.5" + useexternalfile="true" + author="true" + version="true" + use="true" + windowtitle="${javadoc.name}" + doctitle="<h1>${javadoc.name}</h1>" + bottom="<i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.</i>"> + + <fileset dir="plugins" defaultexcludes="yes"> + <!-- SOURCE FOLDERS --> + </fileset> + + <!-- GROUPS --> + + <link href="http://download.oracle.com/javase/1.5.0/docs/api" /> + <link href="http://help.eclipse.org/helios/topic/org.eclipse.platform.doc.isv/reference/api" /> + <link href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.6.0" /> + <!-- DEPENDENCIES --> + + <tag name="Singleton" description="Singleton" /> + <tag name="generated" description="Generated" /> + <tag name="extends" description="Extends" /> + <tag name="model" description="Model" /> + <tag name="ordered" description="Ordered" /> + <tag name="ADDED" description="Added" /> + <tag name="category" description="Category" /> + <tag name="noimplement" description="No Implement" /> + <tag name="noextend" description="No Extend" /> + <tag name="noinstantiate" description="No Instantiate" /> + <tag name="noreference" description="No Reference" /> + </javadoc> + + <replaceregexp match="<!-- Generated by javadoc .*-->" replace=""> + <fileset refid="desthtml" /> + </replaceregexp> + + <replaceregexp match="CONTENT="[^"]+"" replace="CONTENT="""> + <fileset refid="desthtml" /> + </replaceregexp> + + <java classname="org.eclipse.emf.cdo.releng.MakeHrefsRelative" dir="${basedir}" fork="true"> + <classpath path="org.eclipse.emf.cdo.releng/bin" /> + <arg value="${destdir}" /> + </java> + </target> + + <target name="build.clean" depends="clean,build" /> + +</project> diff --git a/releng/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/AssembleJavaDocOptions.java b/releng/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/AssembleJavaDocOptions.java index 996857db72..1cf7917b3c 100644 --- a/releng/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/AssembleJavaDocOptions.java +++ b/releng/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/AssembleJavaDocOptions.java @@ -49,11 +49,14 @@ public class AssembleJavaDocOptions private static File plugins;
+ private static File releng;
+
public static void main(String[] args) throws Exception
{
String workspacePath = args.length == 0 ? ".." : args[0];
workspace = new File(workspacePath);
plugins = new File(workspace, "plugins");
+ releng = new File(workspace, "org.eclipse.emf.cdo.releng");
for (File plugin : plugins.listFiles())
{
@@ -259,7 +262,6 @@ public class AssembleJavaDocOptions public void generate() throws IOException
{
- File releng = new File(workspace, "org.eclipse.emf.cdo.releng");
FileWriter out = null;
try
@@ -420,12 +422,14 @@ public class AssembleJavaDocOptions try
{
- in = new FileReader(new File(project, "javadocTemplate.ant"));
+ in = new FileReader(new File(releng, "javadocTemplate.ant"));
BufferedReader reader = new BufferedReader(in);
String line;
while ((line = reader.readLine()) != null)
{
+ line = line.replace("${PROJECT-NAME}", projectName);
+
String id = line.trim();
if ("<!-- SOURCE FOLDERS -->".equals(id))
{
|