You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by pt...@apache.org on 2008/01/10 17:52:43 UTC
svn commit: r610843 - in
/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse:
org.apache.cactus.eclipse.feature/
org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/common/
Author: ptahchiev
Date: Thu Jan 10 08:52:42 2008
New Revision: 610843
URL: http://svn.apache.org/viewvc?rev=610843&view=rev
Log:
final changes on the eclipse plugin - the new feature with logo and design
Added:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.feature/feature.properties
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.feature/feature.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.feature/logocactus.gif
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/common/LibraryHelper.java
Added: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.feature/feature.properties
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.feature/feature.properties?rev=610843&view=auto
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.feature/feature.properties (added)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.feature/feature.properties Thu Jan 10 08:52:42 2008
@@ -0,0 +1,21 @@
+licenseURL=http://www.apache.org/licenses/LICENSE-2.0
+
+license=\
+<!--\n\
+ Licensed to the Apache Software Foundation (ASF) under one\n\
+ or more contributor license agreements. See the NOTICE file\n\
+ distributed with this work for additional information\n\
+ regarding copyright ownership. The ASF licenses this file\n\
+ to you under the Apache License, Version 2.0 (the\n\
+ "License"); you may not use this file except in compliance\n\
+ with the License. You may obtain a copy of the License at\n\
+ \n\
+ http://www.apache.org/licenses/LICENSE-2.0\n\
+ \n\
+ Unless required by applicable law or agreed to in writing,\n\
+ software distributed under the License is distributed on an\n\
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n\
+ KIND, either express or implied. See the License for the\n\
+ specific language governing permissions and limitations\n\
+ under the License. \n\
+-->\n\
Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.feature/feature.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.feature/feature.xml?rev=610843&r1=610842&r2=610843&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.feature/feature.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.feature/feature.xml Thu Jan 10 08:52:42 2008
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.apache.cactus.eclipse.feature"
- label="org.apache.cactus.eclipse.feature"
- version="1.5.0"
+ label="Cactus Eclipse Feature"
+ version="1.8.0"
provider-name="Apache Software Foundation"
image="logocactus.gif">
@@ -11,77 +11,7 @@
</description>
<license>
- /*
-* ====================================================================
-*
-* The Apache Software License, Version 1.1
-*
-* Copyright (c) 2001-2003 The Apache Software Foundation. All
-rights
-* reserved.
-*
-* Redistribution and use in source and binary forms, with or
-without
-* modification, are permitted provided that the following conditions
-* are met:
-*
-* 1. Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above
-copyright
-* notice, this list of conditions and the following disclaimer
-in
-* the documentation and/or other materials provided with the
-* distribution.
-*
-* 3. The end-user documentation included with the redistribution,
-if
-* any, must include the following acknowlegement:
-* "This product includes software developed by the
-* Apache Software Foundation (http://www.apache.org/)."
-* Alternately, this acknowlegement may appear in the software
-itself,
-* if and wherever such third-party acknowlegements normally
-appear.
-*
-* 4. The names "The Jakarta Project", "Cactus" and "Apache Software
-* Foundation" must not be used to endorse or promote products
-* derived from this software without prior written permission.
-For
-* written permission, please contact apache@apache.org.
-*
-* 5. Products derived from this software may not be called "Apache"
-* nor may "Apache" appear in their names without prior written
-* permission of the Apache Group.
-*
-* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION
-OR
-* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT
-* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-OF
-* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
-WAY OUT
-* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
-OF
-* SUCH DAMAGE.
-* ====================================================================
-*
-* This software consists of voluntary contributions made by many
-* individuals on behalf of the Apache Software Foundation. For
-more
-* information on the Apache Software Foundation, please see
-* <http://www.apache.org/>.
-*
-*/
+ %license
</license>
<requires>
@@ -105,12 +35,12 @@
id="org.apache.cactus.eclipse.runner"
download-size="0"
install-size="0"
- version="1.5.0"/>
+ version="1.8.0"/>
<plugin
id="org.apache.cactus.eclipse.webapp"
download-size="0"
install-size="0"
- version="1.5.0"/>
+ version="1.8.0"/>
</feature>
Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.feature/logocactus.gif
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.feature/logocactus.gif?rev=610843&r1=610842&r2=610843&view=diff
==============================================================================
Binary files - no diff available.
Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/common/LibraryHelper.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/common/LibraryHelper.java?rev=610843&r1=610842&r2=610843&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/common/LibraryHelper.java (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/common/LibraryHelper.java Thu Jan 10 08:52:42 2008
@@ -155,9 +155,12 @@
CactusPlugin thePlugin = CactusPlugin.getDefault();
String plPath = "";
//URL antLibURL = thePlugin.getDefault().find(new Path(CACTUS_LIBRARY_PATH));
+
+ //We have to replace the underscore because our jar is generated with Maven, and
+ //Maven places dashes as a delimiter, between the version and the artifactId.
try {
plPath = JavaCore.getClasspathVariable("ECLIPSE_HOME").toFile().toURL().getPath()+
- CactusPlugin.getDefault().getDescriptor().getInstallURL().getFile().replaceAll("plugin","plugins");
+ CactusPlugin.getDefault().getDescriptor().getInstallURL().getFile().replaceAll("plugin","plugins").replaceAll("_", "-");
CactusPlugin.log("LIb directory"+plPath);
} catch(Exception ex) {
CactusPlugin.log(ex);
---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org