Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2007-05-07 23:46:50 -0400
committerslewis2007-05-07 23:46:50 -0400
commit07759ebab01543f839f5b43568132e5bc497c2a2 (patch)
tree1f028da31c4a213e6f9c1fffa8795869ef1d6cda
parentba8a63cc12a8c7ddb71c243545fe2b8f4bab900b (diff)
downloadorg.eclipse.ecf-07759ebab01543f839f5b43568132e5bc497c2a2.tar.gz
org.eclipse.ecf-07759ebab01543f839f5b43568132e5bc497c2a2.tar.xz
org.eclipse.ecf-07759ebab01543f839f5b43568132e5bc497c2a2.zip
Fixes for source sdk buildv20070507-2047
-rw-r--r--releng/features/org.eclipse.ecf.sdk-feature/build.properties3
-rw-r--r--releng/features/org.eclipse.ecf.sdk-feature/sourceTemplateFeature/build.properties5
-rw-r--r--releng/features/org.eclipse.ecf.sdk-feature/sourceTemplatePlugin/asl-v20.txt (renamed from releng/features/org.eclipse.ecf.sdk-feature/sourceTemplateFeature/about.html)104
-rw-r--r--releng/features/org.eclipse.ecf.sdk-feature/sourceTemplatePlugin/build.properties6
-rw-r--r--releng/features/org.eclipse.ecf.sdk-feature/sourceTemplatePlugin/plugin.properties2
5 files changed, 6 insertions, 114 deletions
diff --git a/releng/features/org.eclipse.ecf.sdk-feature/build.properties b/releng/features/org.eclipse.ecf.sdk-feature/build.properties
index 51047839e..ba9caa6f6 100644
--- a/releng/features/org.eclipse.ecf.sdk-feature/build.properties
+++ b/releng/features/org.eclipse.ecf.sdk-feature/build.properties
@@ -2,6 +2,7 @@ bin.includes = feature.xml,\
about.html,\
asl-v20.txt
src.includes = about.html,\
- asl-v20.txt
+ asl-v20.txt,\
+ feature.xml
generate.feature@org.eclipse.ecf.core.source=org.eclipse.ecf.core
\ No newline at end of file
diff --git a/releng/features/org.eclipse.ecf.sdk-feature/sourceTemplateFeature/build.properties b/releng/features/org.eclipse.ecf.sdk-feature/sourceTemplateFeature/build.properties
index a5f90be2a..16b29a6b0 100644
--- a/releng/features/org.eclipse.ecf.sdk-feature/sourceTemplateFeature/build.properties
+++ b/releng/features/org.eclipse.ecf.sdk-feature/sourceTemplateFeature/build.properties
@@ -1,3 +1,2 @@
-bin.includes =\
-feature.xml,\
-about.html \ No newline at end of file
+bin.includes = feature.xml,\
+ about.html \ No newline at end of file
diff --git a/releng/features/org.eclipse.ecf.sdk-feature/sourceTemplateFeature/about.html b/releng/features/org.eclipse.ecf.sdk-feature/sourceTemplatePlugin/asl-v20.txt
index cc8348cd3..d64569567 100644
--- a/releng/features/org.eclipse.ecf.sdk-feature/sourceTemplateFeature/about.html
+++ b/releng/features/org.eclipse.ecf.sdk-feature/sourceTemplatePlugin/asl-v20.txt
@@ -1,103 +1,3 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>May 11, 2006</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-<h3>Third Party Content</h3>
-
-<p>The Content includes items that have been sourced from third parties as set out below. If you
-did not receive this Content directly from the Eclipse Foundation, the following is provided
-for informational purposes only, and you should look to the Redistributor's license for
-terms and conditions of use.</p>
-
-<h3>Apache HttpClient v3.0.1</h3>
-
-<p>This plugin is based on software developed by the Apache Httpclient project at <a href="http://jakarta.apache.org/commons/httpclient/">http://jakarta.apache.org/commons/httpclient/</a>.
-A copy of this library is distributed within this plugin and
-therefore this plugin is subject to the Apache License version 2.0, a copy of the license is contained
-in the file <a href="asl-v20.txt">asl-v20.txt</a> and
-at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>.
-</p>
-
-<h3>Apache Commons Codec v1.3</h3>
-
-<p>This plugin is based on software developed by the Apache Commons Codec project at <a href="http://jakarta.apache.org/commons/codec/">http://jakarta.apache.org/commons/codec/</a>.
-A copy of this library is distributed within this plugin and
-therefore this plugin is subject to the Apache License version 2.0, a copy of the license is contained
-in the file <a href="asl-v20.txt">asl-v20.txt</a> and
-at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>.
-</p>
-
-<h3>Apache Commons Logging v1.1</h3>
-
-<p>This plugin is based on software developed by the Apache Commons Codec project at <a href="http://jakarta.apache.org/commons/logging/">http://jakarta.apache.org/commons/logging/</a>.
-A copy of this library is distributed within this plugin and
-therefore this plugin is subject to the Apache License version 2.0, a copy of the license is contained
-in the file <a href="asl-v20.txt">asl-v20.txt</a> and
-at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>.
-</p>
-
-<h3>IRCLib API v1.10</h3>
-
-<p>This plugin is based on software developed by <a href="http://schwering.org">Christoph Schwering</a> at
-<a href="http://moepii.sourceforge.net/">http://moepii.sourceforge.net/</a>.
-A copy of this library is distributed within this plugin and
-therefore this plugin is subject to the Apache License version 2.0, a copy of the license is contained
-in the file <a href="asl-v20.txt">asl-v20.txt</a> and
-at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>.
-</p>
-
-<h3>JmDNS API v1.0</h3>
-
-<p>This plugin is based on software developed by JmDNS project team at
-<a href="http://jmdns.sourceforge.net">http://jmdns.sourceforge.net</a>.
-A copy of this library is distributed within this plugin and
-therefore this plugin is subject to the Apache License version 2.0, a copy of the license is contained
-in the file <a href="asl-v20.txt">asl-v20.txt</a> and
-at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>.
-</p>
-
-<h3>Jive Software Smack API v2.1.1</h3>
-
-<p>This plugin is based on software developed by <a href="http://www.jivesoftware.org">Jive Software</a> project team at
-<a href="http://www.igniterealtime.org/">http://www.igniterealtime.org/</a>.
-A copy of this library is distributed within this plugin and
-therefore this plugin is subject to the Apache License version 2.0, a copy of the license is contained
-in the file <a href="asl-v20.txt">asl-v20.txt</a> and
-at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>.
-</p>
-
-
-<p>Your use of the this plugin and the components listed above is subject to the terms and conditions of the Apache License v2.0
-which is available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>.
-</p>
-<p>
-More specifically:</p>
-
-<p></p>
-
-<pre>
Apache License
Version 2.0, January 2004
@@ -300,7 +200,3 @@ More specifically:</p>
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-</pre>
-
-</body>
-</html> \ No newline at end of file
diff --git a/releng/features/org.eclipse.ecf.sdk-feature/sourceTemplatePlugin/build.properties b/releng/features/org.eclipse.ecf.sdk-feature/sourceTemplatePlugin/build.properties
index 02d96a07b..e70043ee4 100644
--- a/releng/features/org.eclipse.ecf.sdk-feature/sourceTemplatePlugin/build.properties
+++ b/releng/features/org.eclipse.ecf.sdk-feature/sourceTemplatePlugin/build.properties
@@ -1,7 +1,5 @@
bin.includes = plugin.xml,\
- plugin.properties,\
about.html,\
- src/,\
- META-INF/
-
+ asl-v20.txt,\
+ src/
sourcePlugin = true \ No newline at end of file
diff --git a/releng/features/org.eclipse.ecf.sdk-feature/sourceTemplatePlugin/plugin.properties b/releng/features/org.eclipse.ecf.sdk-feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index 809eb46bd..000000000
--- a/releng/features/org.eclipse.ecf.sdk-feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-pluginName = ECF Core Source
-providerName = Eclipse.org \ No newline at end of file

Back to the top