You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by mc...@apache.org on 2008/12/08 05:51:14 UTC
svn commit: r724255 -
/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/operations/SharedLibEntryCreationOperation.java
Author: mcconne
Date: Sun Dec 7 20:51:14 2008
New Revision: 724255
URL: http://svn.apache.org/viewvc?rev=724255&view=rev
Log:
GERONIMODEVTOOLS-550 Correct manifest.mfsharedlib entries for Eclipse projects wiht the root directory different then the project name
Modified:
geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/operations/SharedLibEntryCreationOperation.java
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/operations/SharedLibEntryCreationOperation.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/operations/SharedLibEntryCreationOperation.java?rev=724255&r1=724254&r2=724255&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/operations/SharedLibEntryCreationOperation.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/operations/SharedLibEntryCreationOperation.java Sun Dec 7 20:51:14 2008
@@ -283,7 +283,7 @@
// if no outputlocation, output path will get picked up by
// default output path
if(includeOutputLocations && entry.getOutputLocation() != null) {
- path = project.getLocation().removeLastSegments(1).append(entry.getOutputLocation()).addTrailingSeparator().toOSString();
+ path = project.getLocation().append(entry.getOutputLocation().removeFirstSegments(1)).addTrailingSeparator().toOSString();
}
} else {
path = resolveVarOrLibEntry(entry);