JBoss Tools SVN: r34988 - trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-09-22 20:33:05 -0400 (Thu, 22 Sep 2011)
New Revision: 34988
Modified:
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ParametedType.java
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ParametedTypeFactory.java
Log:
JBIDE-9763
https://issues.jboss.org/browse/JBIDE-9763
When building inheritance for parameted types, resolved parameters are reused from base types.
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ParametedType.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ParametedType.java 2011-09-23 00:31:25 UTC (rev 34987)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ParametedType.java 2011-09-23 00:33:05 UTC (rev 34988)
@@ -29,11 +29,11 @@
* @author Viacheslav Kabanovich
*
*/
-@SuppressWarnings("nls")
+//@SuppressWarnings("nls")
public class ParametedType implements IParametedType {
protected ParametedTypeFactory typeFactory = null;
protected IType type;
- protected String arrayPrefix = "";
+ protected String arrayPrefix = ""; //$NON-NLS-1$
protected String signature;
protected List<ParametedType> parameterTypes = new ArrayList<ParametedType>();
protected boolean primitive;
@@ -117,10 +117,10 @@
public void setSignature(String signature) {
this.signature = signature;
- arrayPrefix = "";
+ arrayPrefix = ""; //$NON-NLS-1$
if(signature != null) {
for (int i = 0; i < signature.length(); i++) {
- if(signature.charAt(i) == '[') arrayPrefix += "["; else break;
+ if(signature.charAt(i) == Signature.C_ARRAY) arrayPrefix += Signature.C_ARRAY; else break;
}
}
}
@@ -235,16 +235,18 @@
if(typeSignature == null) {
return typeSignature;
}
- int i = typeSignature.indexOf('<');
+ int i = typeSignature.indexOf(Signature.C_GENERIC_START);
if(i < 0) {
- if(( typeSignature.startsWith("T") || typeSignature.startsWith("Q") || typeSignature.startsWith("L")) && typeSignature.endsWith(";")) {
+ char c = typeSignature.length() == 0 ? '\0' : typeSignature.charAt(0);
+ char e = typeSignature.length() == 0 ? '\0' : typeSignature.charAt(typeSignature.length() - 1);
+ if((c == Signature.C_TYPE_VARIABLE || c == Signature.C_UNRESOLVED || c == Signature.C_RESOLVED) && e == Signature.C_SEMICOLON) {
String param = typeSignature.substring(1, typeSignature.length() - 1);
String s = findParameterSignature(param);
return s == null ? typeSignature : s;
}
return typeSignature;
}
- int j = typeSignature.lastIndexOf('>');
+ int j = typeSignature.lastIndexOf(Signature.C_GENERIC_END);
if(j < i) {
return typeSignature;
}
@@ -257,7 +259,11 @@
newParams.append(newParam);
}
if(replaced) {
- typeSignature = typeSignature.substring(0, i) + '<' + newParams.toString() + '>' + ';';
+ typeSignature = typeSignature.substring(0, i)
+ + Signature.C_GENERIC_START
+ + newParams.toString()
+ + Signature.C_GENERIC_END
+ + Signature.C_SEMICOLON;
}
return typeSignature;
}
@@ -325,7 +331,12 @@
public boolean isAssignableTo(ParametedType other, boolean checkInheritance) {
if(equals(other)) return true;
- if(this.type == null) return false;
+ if("*".equals(other.getSignature())) {
+ return true;
+ }
+ if(this.type == null) {
+ return (isVariable && other.isVariable && other.type == null);
+ }
if(other.isVariable && other.type == null) return true;
if(this.type.equals(other.type)) {
if(areTypeParametersAssignableTo(other)) return true;
@@ -344,7 +355,7 @@
for (int i = 0; i < parameterTypes.size(); i++) {
ParametedType p1 = parameterTypes.get(i);
ParametedType p2 = other.parameterTypes.get(i);
- if(p1.isLower() || p1.isUpper()) return false;
+ if(p1.isLower() || (p1.isUpper() && !p1.isVariable)) return false;
if(p1.isVariable()) {
if(p2.isVariable()) {
if(p2.isAssignableTo(p1, true)) continue;
@@ -391,7 +402,7 @@
StringBuilder result = new StringBuilder(primitives.get(Signature.getSignatureSimpleName(getSignature().substring(array))));
if(array > 0) {
for (int i = 0; i < array; i++) {
- result.append("[]");
+ result.append("[]"); //$NON-NLS-1$
}
}
return result.toString();
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ParametedTypeFactory.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ParametedTypeFactory.java 2011-09-23 00:31:25 UTC (rev 34987)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ParametedTypeFactory.java 2011-09-23 00:33:05 UTC (rev 34988)
@@ -12,7 +12,6 @@
import java.util.HashMap;
import java.util.Map;
-import java.util.StringTokenizer;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.IMember;
@@ -26,18 +25,19 @@
public class ParametedTypeFactory {
// I S J C F D Z
- static HashMap<String,String> primitives = new HashMap<String, String>();
+ static HashMap<Character,String> primitives = new HashMap<Character, String>();
static {
- primitives.put("I", "Ljava.lang.Integer;");
- primitives.put("S", "Ljava.lang.Short;");
- primitives.put("J", "Ljava.lang.Long;");
- primitives.put("C", "Ljava.lang.Character;");
- primitives.put("F", "Ljava.lang.Float;");
- primitives.put("D", "Ljava.lang.Double;");
- primitives.put("Z", "Ljava.lang.Boolean;");
+ primitives.put(Signature.C_INT, "Ljava.lang.Integer;");
+ primitives.put(Signature.C_SHORT, "Ljava.lang.Short;");
+ primitives.put(Signature.C_LONG, "Ljava.lang.Long;");
+ primitives.put(Signature.C_CHAR, "Ljava.lang.Character;");
+ primitives.put(Signature.C_FLOAT, "Ljava.lang.Float;");
+ primitives.put(Signature.C_DOUBLE, "Ljava.lang.Double;");
+ primitives.put(Signature.C_BOOLEAN, "Ljava.lang.Boolean;");
+ primitives.put(Signature.C_BYTE, "Ljava.lang.Boolean;");
}
//unresolved Object signature
- public static String OBJECT = "QObject;";
+ public static String OBJECT = "QObject;"; //$NON-NLS-1$
Map<String, ParametedType> cache = new HashMap<String, ParametedType>();
public ParametedType newParametedType(IType type) {
@@ -55,7 +55,7 @@
}
parametedType.setFactory(this);
parametedType.setType(type);
- if(type != null) parametedType.setSignature("L" + type.getFullyQualifiedName() + ";");
+ if(type != null) parametedType.setSignature(Signature.C_RESOLVED + type.getFullyQualifiedName() + Signature.C_SEMICOLON);
String[] ps = null;
try {
ps = type.getTypeParameterSignatures();
@@ -96,28 +96,32 @@
typeSignature = typeSignature.substring(result.getArrayPrefix().length());
- if(primitives.containsKey(typeSignature)) {
- typeSignature = primitives.get(typeSignature);
+ char c = typeSignature.length() == 0 ? '\0' : typeSignature.charAt(0);
+ if(primitives.containsKey(c) && typeSignature.length() == 1) {
+ typeSignature = primitives.get(c);
result.setSignature(result.getArrayPrefix() + typeSignature);
result.setPrimitive(true);
- } else if(typeSignature.startsWith("+")) {
+ } else if(c == Signature.C_EXTENDS) {
typeSignature = typeSignature.substring(1);
result.setUpper(true);
- } else if(typeSignature.startsWith("-")) {
+ } else if(c == Signature.C_SUPER) {
typeSignature = typeSignature.substring(1);
result.setLower(true);
- }
+ } else if(c == Signature.C_STAR && typeSignature.length() == 1) {
+ result.setUpper(true);
+ return result;
+ }
- int startToken = typeSignature.indexOf('<');
+ int startToken = typeSignature.indexOf(Signature.C_GENERIC_START);
if(startToken < 0) {
String resovedTypeName = EclipseJavaUtil.resolveTypeAsString(contextType, typeSignature);
if(resovedTypeName == null) return null;
- if(!context.isBinary()) {
+ if(!context.isBinary() || typeSignature.charAt(0) == Signature.C_TYPE_VARIABLE) {
StringBuffer ns = new StringBuffer();
ns.append(result.getArrayPrefix());
- if(result.isLower()) ns.append('-');
- if(result.isUpper()) ns.append('+');
- ns.append('L').append(resovedTypeName).append(";");
+ if(result.isLower()) ns.append(Signature.C_SUPER);
+ if(result.isUpper()) ns.append(Signature.C_EXTENDS);
+ ns.append(Signature.C_RESOLVED).append(resovedTypeName).append(Signature.C_SEMICOLON);
result.setSignature(ns.toString());
}
IType type = EclipseJavaUtil.findType(context.getJavaProject(), resovedTypeName);
@@ -131,7 +135,7 @@
for (int i = 0; i < ps.length; i++) {
ParametedType st = getParametedTypeForParameter(context, ps[i], result);
if(st != null) {
- if(st.getSignature().indexOf(':') >= 0) {
+ if(st.getSignature().indexOf(Signature.C_COLON) >= 0) {
CommonPlugin.getDefault().logWarning("Wrong signature=" + st.getSignature());
}
return st;
@@ -144,7 +148,7 @@
if(st != null) return st;
}
} else {
- int endToken = typeSignature.lastIndexOf('>');
+ int endToken = typeSignature.lastIndexOf(Signature.C_GENERIC_END);
if(endToken < startToken) return null;
String typeName = typeSignature.substring(0, startToken) + typeSignature.substring(endToken + 1);
String resovedTypeName = EclipseJavaUtil.resolveTypeAsString(contextType, typeName);
@@ -172,9 +176,14 @@
if(!context.isBinary()) {
StringBuffer ns = new StringBuffer();
ns.append(result.getArrayPrefix());
- if(result.isLower()) ns.append('-');
- if(result.isUpper()) ns.append('+');
- ns.append('L').append(resovedTypeName).append('<').append(newParams).append(">;");
+ if(result.isLower()) ns.append(Signature.C_SUPER);
+ if(result.isUpper()) ns.append(Signature.C_EXTENDS);
+ ns.append(Signature.C_RESOLVED)
+ .append(resovedTypeName)
+ .append(Signature.C_GENERIC_START)
+ .append(newParams)
+ .append(Signature.C_GENERIC_END)
+ .append(Signature.C_SEMICOLON);
result.setSignature(ns.toString());
}
return result;
@@ -190,13 +199,13 @@
String t = Signature.getTypeVariable(typeParameterSignature);
String[] bounds = Signature.getTypeParameterBounds(typeParameterSignature);
- t = "L" + t + ";";
+ t = Signature.C_RESOLVED + t + Signature.C_SEMICOLON;
if(result == null || t.equals(result.getSignature())) {
- String sts = bounds.length > 0 ? bounds[0] : "";
- if(sts.length() > 0) {
- ParametedType st = getParametedType(contextType, sts);
+ if(bounds.length > 0 && bounds[0].length() > 0) {
+ ParametedType st = getParametedType(contextType, bounds[0]);
if(st != null) {
result = new TypeDeclaration(st, context.getResource(), 0, 0);
+ result.setUpper(true);
}
} else if(result != null) {
result.setSignature(t);
14 years, 6 months
JBoss Tools SVN: r34987 - workspace/dgolovin/new-releng/parent.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-09-22 20:31:25 -0400 (Thu, 22 Sep 2011)
New Revision: 34987
Modified:
workspace/dgolovin/new-releng/parent/pom.xml
Log:
added
<environment>
<os>macosx</os>
<ws>cocoa</ws>
<arch>x86_64</arch>
</environment>
Modified: workspace/dgolovin/new-releng/parent/pom.xml
===================================================================
--- workspace/dgolovin/new-releng/parent/pom.xml 2011-09-23 00:23:19 UTC (rev 34986)
+++ workspace/dgolovin/new-releng/parent/pom.xml 2011-09-23 00:31:25 UTC (rev 34987)
@@ -38,6 +38,11 @@
<arch>x86</arch>
</environment>
<environment>
+ <os>macosx</os>
+ <ws>cocoa</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86</arch>
@@ -72,6 +77,11 @@
<arch>x86</arch>
</environment>
<environment>
+ <os>macosx</os>
+ <ws>cocoa</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86</arch>
14 years, 6 months
JBoss Tools SVN: r34986 - in trunk/jst: tests/org.jboss.tools.jst.web.test/META-INF and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-09-22 20:23:19 -0400 (Thu, 22 Sep 2011)
New Revision: 34986
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF
trunk/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF
trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebUtilTest.java
Log:
https://issues.jboss.org/browse/JBIDE-9766 WebUtils test
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF 2011-09-23 00:00:32 UTC (rev 34985)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF 2011-09-23 00:23:19 UTC (rev 34986)
@@ -22,7 +22,9 @@
org.eclipse.jst.jsp.core;bundle-version="1.2.400",
org.eclipse.jst.j2ee.core;bundle-version="1.2.100",
org.eclipse.wst.common.project.facet.core;bundle-version="1.4.200",
- org.eclipse.wst.validation;bundle-version="1.2.300"
+ org.eclipse.wst.validation;bundle-version="1.2.300",
+ org.eclipse.jst.j2ee.ejb;bundle-version="1.1.502",
+ org.eclipse.jst.j2ee.web;bundle-version="1.1.500"
Bundle-Version: 3.3.0.qualifier
Export-Package:
org.jboss.tools.jst.web,
Modified: trunk/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF 2011-09-23 00:00:32 UTC (rev 34985)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF 2011-09-23 00:23:19 UTC (rev 34986)
@@ -4,21 +4,11 @@
Bundle-SymbolicName: org.jboss.tools.jst.web.test;singleton:=true
Bundle-Version: 3.3.0.qualifier
Require-Bundle: org.jboss.tools.jst.web,
- org.eclipse.ui;bundle-version="3.7.0",
- org.eclipse.jdt.launching;bundle-version="3.6.0",
- org.eclipse.debug.ui;bundle-version="3.7.0",
- org.eclipse.jdt.debug;bundle-version="3.7.0",
- org.eclipse.wst.server.core;bundle-version="1.1.302",
- org.eclipse.jem.util;bundle-version="2.1.2",
- org.eclipse.wst.sse.core;bundle-version="1.1.600",
- org.eclipse.jst.j2ee;bundle-version="1.1.500",
- org.eclipse.ltk.core.refactoring;bundle-version="3.5.200",
- org.eclipse.jst.jsp.core;bundle-version="1.2.400",
- org.eclipse.jst.j2ee.core;bundle-version="1.2.100",
- org.eclipse.wst.common.project.facet.core;bundle-version="1.4.200",
- org.eclipse.wst.validation;bundle-version="1.2.300",
org.junit,
- org.jboss.tools.tests
+ org.jboss.tools.tests,
+ org.eclipse.jst.standard.schemas,
+ org.eclipse.ui,
+ org.eclipse.wst.validation
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Bundle-Vendor.0
Export-Package: org.jboss.tools.jst.web.test
Modified: trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebUtilTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebUtilTest.java 2011-09-23 00:00:32 UTC (rev 34985)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebUtilTest.java 2011-09-23 00:23:19 UTC (rev 34986)
@@ -13,6 +13,7 @@
import junit.framework.TestCase;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
import org.jboss.tools.jst.web.WebUtils;
@@ -29,6 +30,8 @@
@Override
protected void setUp() throws Exception {
project = ResourcesPlugin.getWorkspace().getRoot().getProject(JstWebAllTests.PROJECT_NAME);
+ IResource target = project.getFolder("target");
+ target.setDerived(true, null);
}
/**
@@ -36,7 +39,7 @@
* @throws Exception
*/
public void testGetWebRootFolders() throws Exception {
- assertEquals(1, WebUtils.getWebRootFolders(project));
- assertEquals(2, WebUtils.getWebRootFolders(project, false));
+ assertEquals(1, WebUtils.getWebRootFolders(project).length);
+ assertEquals(2, WebUtils.getWebRootFolders(project, false).length);
}
}
\ No newline at end of file
14 years, 6 months
JBoss Tools SVN: r34985 - trunk/jst/tests/org.jboss.tools.jst.web.test/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-09-22 20:00:32 -0400 (Thu, 22 Sep 2011)
New Revision: 34985
Modified:
trunk/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF
Log:
https://issues.jboss.org/browse/JBIDE-9766 WebUtils test
Modified: trunk/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF 2011-09-22 23:31:04 UTC (rev 34984)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF 2011-09-23 00:00:32 UTC (rev 34985)
@@ -4,11 +4,21 @@
Bundle-SymbolicName: org.jboss.tools.jst.web.test;singleton:=true
Bundle-Version: 3.3.0.qualifier
Require-Bundle: org.jboss.tools.jst.web,
+ org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.jdt.launching;bundle-version="3.6.0",
+ org.eclipse.debug.ui;bundle-version="3.7.0",
+ org.eclipse.jdt.debug;bundle-version="3.7.0",
+ org.eclipse.wst.server.core;bundle-version="1.1.302",
+ org.eclipse.jem.util;bundle-version="2.1.2",
+ org.eclipse.wst.sse.core;bundle-version="1.1.600",
+ org.eclipse.jst.j2ee;bundle-version="1.1.500",
+ org.eclipse.ltk.core.refactoring;bundle-version="3.5.200",
+ org.eclipse.jst.jsp.core;bundle-version="1.2.400",
+ org.eclipse.jst.j2ee.core;bundle-version="1.2.100",
+ org.eclipse.wst.common.project.facet.core;bundle-version="1.4.200",
+ org.eclipse.wst.validation;bundle-version="1.2.300",
org.junit,
- org.jboss.tools.tests,
- org.eclipse.jst.standard.schemas,
- org.eclipse.ui,
- org.eclipse.wst.validation
+ org.jboss.tools.tests
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Bundle-Vendor.0
Export-Package: org.jboss.tools.jst.web.test
14 years, 6 months
JBoss Tools SVN: r34984 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-09-22 19:31:04 -0400 (Thu, 22 Sep 2011)
New Revision: 34984
Modified:
trunk/build/pom.xml
Log:
added experimental profiles to let to do the tests coverage reporting for cdi component build
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2011-09-22 23:28:04 UTC (rev 34983)
+++ trunk/build/pom.xml 2011-09-22 23:31:04 UTC (rev 34984)
@@ -366,7 +366,7 @@
<id>cdi-tests</id>
<modules>
<module>libs</module>
- <module>../cdi</module>
+ <module>../cdi/tests</module>
<module>reports/emma-coverage</module>
</modules>
</profile>
14 years, 6 months
JBoss Tools SVN: r34983 - trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-09-22 19:28:04 -0400 (Thu, 22 Sep 2011)
New Revision: 34983
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebUtils.java
Log:
https://issues.jboss.org/browse/JBIDE-9766 Refactor org.jboss.tools.jst.web.WebUtils.getWebRootFolders() to take into account derived resources and default web root folder
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebUtils.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebUtils.java 2011-09-22 23:21:13 UTC (rev 34982)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebUtils.java 2011-09-22 23:28:04 UTC (rev 34983)
@@ -88,6 +88,17 @@
return (modelNature != null) ? WebProject.getInstance(modelNature.getModel()).getWebRootLocation() : null;
}
+ private static final IContainer[] EMPTY_ARRAY = new IContainer[0];
+
+ /**
+ * Returns all the web root folders of the project.
+ * If the project is not a web project then the method will return an empty array.
+ * If ignoreDerived==true then all the derived resources or resources belonged to derived containers will be eliminated.
+ * If some folder is set as default web root source folder (available since WTP 3.3.1) then this folder will be places in the very beginning of the result array.
+ * @param project
+ * @param ignoreDerived
+ * @return
+ */
public static IContainer[] getWebRootFolders(IProject project, boolean ignoreDerived) {
IFacetedProject facetedProject = null;
try {
@@ -120,15 +131,23 @@
}
}
}
- return null;
+ return EMPTY_ARRAY;
}
private static boolean WTP_3_3_0 = false;
+ /**
+ * Returns all the web root folders of the project.
+ * If the project is not a web project then the method will return an empty array.
+ * All the derived resources or resources belonged to derived containers will be eliminated.
+ * If some folder is set as default web root source folder (available since WTP 3.3.1) then this folder will be places in the very beginning of the result array.
+ * @param project
+ * @return
+ */
public static IPath getDefaultDeploymentDescriptorFolder(IVirtualFolder folder) {
if(!WTP_3_3_0) {
try {
- Method getDefaultDeploymentDescriptorFolder = J2EEModuleVirtualComponent.class.getMethod("getDefaultDeploymentDescriptorFolder", IVirtualFolder.class);
+ Method getDefaultDeploymentDescriptorFolder = J2EEModuleVirtualComponent.class.getMethod("getDefaultDeploymentDescriptorFolder", IVirtualFolder.class); //$NON-NLS-1$
return (IPath) getDefaultDeploymentDescriptorFolder.invoke(null, folder);
} catch (NoSuchMethodException nsme) {
// Not available in this WTP version, let's ignore it
14 years, 6 months
JBoss Tools SVN: r34982 - in trunk/jst/tests/org.jboss.tools.jst.web.test: projects/testWebProject and 10 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-09-22 19:21:13 -0400 (Thu, 22 Sep 2011)
New Revision: 34982
Added:
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.classpath
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.project
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/.jsdtscope
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/org.eclipse.wst.common.component
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/org.eclipse.wst.jsdt.ui.superType.container
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/org.eclipse.wst.jsdt.ui.superType.name
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/WebContent/
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/WebContent/META-INF/
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/WebContent/META-INF/MANIFEST.MF
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/WebContent/WEB-INF/
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/WebContent/WEB-INF/lib/
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/build/
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/build/classes/
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/src/
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/target/
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/target/m2e-wtp/
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/target/m2e-wtp/web-resources/
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/target/m2e-wtp/web-resources/META-INF/
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebUtilTest.java
Modified:
trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/JstWebAllTests.java
Log:
https://issues.jboss.org/browse/JBIDE-9766 Refactor org.jboss.tools.jst.web.WebUtils.getWebRootFolders() to take into account derived resources and default web root folder
Added: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.classpath
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.classpath (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.classpath 2011-09-22 23:21:13 UTC (rev 34982)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_20">
+ <attributes>
+ <attribute name="owner.project.facets" value="java"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/JBoss 6.x Runtime">
+ <attributes>
+ <attribute name="owner.project.facets" value="jst.web"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry kind="output" path="build/classes"/>
+</classpath>
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.classpath
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.project
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.project (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.project 2011-09-22 23:21:13 UTC (rev 34982)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>testWebProject</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/.jsdtscope
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/.jsdtscope (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/.jsdtscope 2011-09-22 23:21:13 UTC (rev 34982)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="WebContent"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+ <attributes>
+ <attribute name="hide" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+ <classpathentry kind="output" path=""/>
+</classpath>
Added: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/org.eclipse.wst.common.component (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/org.eclipse.wst.common.component 2011-09-22 23:21:13 UTC (rev 34982)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="testWebProject">
+ <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+ <wb-resource deploy-path="/" source-path="/WebContent"/>
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
+ <property name="context-root" value="testWebProject"/>
+ <property name="java-output-path" value="/testWebProject/build/classes"/>
+ </wb-module>
+</project-modules>
Added: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/org.eclipse.wst.common.project.facet.core.xml 2011-09-22 23:21:13 UTC (rev 34982)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <runtime name="JBoss 6.x Runtime"/>
+ <fixed facet="java"/>
+ <fixed facet="jst.web"/>
+ <fixed facet="wst.jsdt.web"/>
+ <installed facet="java" version="1.6"/>
+ <installed facet="jst.web" version="3.0"/>
+ <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/org.eclipse.wst.common.project.facet.core.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/org.eclipse.wst.jsdt.ui.superType.container
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/org.eclipse.wst.jsdt.ui.superType.container 2011-09-22 23:21:13 UTC (rev 34982)
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
Added: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/org.eclipse.wst.jsdt.ui.superType.name
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/.settings/org.eclipse.wst.jsdt.ui.superType.name 2011-09-22 23:21:13 UTC (rev 34982)
@@ -0,0 +1 @@
+Window
\ No newline at end of file
Added: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/WebContent/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/WebContent/META-INF/MANIFEST.MF (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/WebContent/META-INF/MANIFEST.MF 2011-09-22 23:21:13 UTC (rev 34982)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/WebContent/META-INF/MANIFEST.MF
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF 2011-09-22 23:21:13 UTC (rev 34982)
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Built-By: igels
+Build-Jdk: 1.6.0_20
+Created-By: Maven Integration for Eclipse
+
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/JstWebAllTests.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/JstWebAllTests.java 2011-09-22 23:16:08 UTC (rev 34981)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/JstWebAllTests.java 2011-09-22 23:21:13 UTC (rev 34982)
@@ -13,12 +13,22 @@
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
+
public class JstWebAllTests {
+ public static final String PROJECT_NAME = "testWebProject";
+ private static final String PROJECT_PATH = "/projects/" + PROJECT_NAME;
+
public static Test suite() {
TestSuite suite = new TestSuite(JstWebAllTests.class.getName());
suite.addTestSuite(WebContentAssistProviderTest.class);
suite.addTestSuite(BuilderTest.class);
+ suite.addTest(new ProjectImportTestSetup(new TestSuite(
+ WebUtilTest.class),
+ "org.jboss.tools.jst.web.test", //$NON-NLS-1$
+ PROJECT_PATH, //$NON-NLS-1$
+ PROJECT_NAME));
return suite;
}
}
\ No newline at end of file
Added: trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebUtilTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebUtilTest.java (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebUtilTest.java 2011-09-22 23:21:13 UTC (rev 34982)
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jst.web.test;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.jboss.tools.jst.web.WebUtils;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class WebUtilTest extends TestCase {
+
+ private IProject project;
+
+ /* (non-Javadoc)
+ * @see junit.framework.TestCase#setUp()
+ */
+ @Override
+ protected void setUp() throws Exception {
+ project = ResourcesPlugin.getWorkspace().getRoot().getProject(JstWebAllTests.PROJECT_NAME);
+ }
+
+ /**
+ * See https://issues.jboss.org/browse/JBIDE-9766
+ * @throws Exception
+ */
+ public void testGetWebRootFolders() throws Exception {
+ assertEquals(1, WebUtils.getWebRootFolders(project));
+ assertEquals(2, WebUtils.getWebRootFolders(project, false));
+ }
+}
\ No newline at end of file
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebUtilTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 6 months
JBoss Tools SVN: r34981 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-09-22 19:16:08 -0400 (Thu, 22 Sep 2011)
New Revision: 34981
Modified:
trunk/build/pom.xml
Log:
added experimental profiles to let to do the tests coverage reporting for cdi component build
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2011-09-22 23:13:54 UTC (rev 34980)
+++ trunk/build/pom.xml 2011-09-22 23:16:08 UTC (rev 34981)
@@ -18,19 +18,12 @@
-->
<profile>
- <id>parent</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <modules>
- <module>parent</module>
- </modules>
- </profile>
-
- <profile>
<id>libs</id>
<activation>
<activeByDefault>true</activeByDefault>
+ <property>
+ <name>coverage</name>
+ </property>
</activation>
<modules>
<module>libs</module>
@@ -370,6 +363,15 @@
</profile>
<profile>
+ <id>cdi-tests</id>
+ <modules>
+ <module>libs</module>
+ <module>../cdi</module>
+ <module>reports/emma-coverage</module>
+ </modules>
+ </profile>
+
+ <profile>
<id>cdi-bootstrap</id>
<modules>
<module>../tests</module>
@@ -380,6 +382,18 @@
</profile>
<profile>
+ <id>cdi-botstrap-tests</id>
+ <modules>
+ <module>libs</module>
+ <module>../tests</module>
+ <module>../common</module>
+ <module>../jst</module>
+ <module>../cdi</module>
+ <module>reports/emma-coverage</module>
+ </modules>
+ </profile>
+
+ <profile>
<id>birt</id>
<activation>
<activeByDefault>true</activeByDefault>
@@ -639,6 +653,9 @@
<id>aggregate-coverage</id>
<activation>
<activeByDefault>true</activeByDefault>
+ <property>
+ <name>coverage</name>
+ </property>
</activation>
<modules>
<module>reports/emma-coverage</module>
14 years, 6 months
JBoss Tools SVN: r34980 - in trunk/build/aggregate: site and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-09-22 19:13:54 -0400 (Thu, 22 Sep 2011)
New Revision: 34980
Modified:
trunk/build/aggregate/bottests-site/site/pom.xml
trunk/build/aggregate/site/pom.xml
trunk/build/aggregate/soa-site/pom.xml
Log:
nest values of BUILD_ALIAS and JBT_VERSION inside <ant> call
Modified: trunk/build/aggregate/bottests-site/site/pom.xml
===================================================================
--- trunk/build/aggregate/bottests-site/site/pom.xml 2011-09-22 23:04:49 UTC (rev 34979)
+++ trunk/build/aggregate/bottests-site/site/pom.xml 2011-09-22 23:13:54 UTC (rev 34980)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools</groupId>
@@ -12,11 +13,9 @@
<version>0.0.1-SNAPSHOT</version>
<packaging>eclipse-update-site</packaging>
- <!-- to build against locally built sources, use:
- mvn clean install
- to build against http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/, use:
- mvn clean install -Pjbosstools-nightly-staging-composite
- -->
+ <!-- to build against locally built sources, use: mvn clean install to build
+ against http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/,
+ use: mvn clean install -Pjbosstools-nightly-staging-composite -->
<build>
<plugins>
<plugin>
@@ -31,9 +30,10 @@
<quiet>true</quiet>
<tasks>
<!-- called AFTER generating update site + zip to add in extra content -->
- <property name="JBT_VERSION" value="${JBT_VERSION}"/>
- <property name="BUILD_ALIAS" value="${BUILD_ALIAS}"/>
- <ant antfile="build.xml"/>
+ <ant antfile="build.xml">
+ <property name="JBT_VERSION" value="${JBT_VERSION}" />
+ <property name="BUILD_ALIAS" value="${BUILD_ALIAS}" />
+ </ant>
</tasks>
</configuration>
<goals>
Modified: trunk/build/aggregate/site/pom.xml
===================================================================
--- trunk/build/aggregate/site/pom.xml 2011-09-22 23:04:49 UTC (rev 34979)
+++ trunk/build/aggregate/site/pom.xml 2011-09-22 23:13:54 UTC (rev 34980)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools</groupId>
@@ -13,8 +14,9 @@
<packaging>eclipse-update-site</packaging>
<properties>
- <!-- add more inputRepos into the composite metadata at the URL below. Therefore need not edit this file and add dozens of URLs
- which need to be called by Ant script later -->
+ <!-- add more inputRepos into the composite metadata at the URL below.
+ Therefore need not edit this file and add dozens of URLs which need to be
+ called by Ant script later -->
<!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo -->
<inputRepo1>http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/</inputRepo1>
<inputRepos>1</inputRepos>
@@ -34,11 +36,12 @@
<quiet>true</quiet>
<tasks>
<!-- called AFTER generating update site + zip to add in extra content -->
- <property name="inputRepo1" value="${inputRepo1}"/>
- <property name="inputRepos" value="${inputRepos}"/>
- <property name="JBT_VERSION" value="${JBT_VERSION}"/>
- <property name="BUILD_ALIAS" value="${BUILD_ALIAS}"/>
- <ant antfile="build.xml"/>
+ <property name="inputRepo1" value="${inputRepo1}" />
+ <property name="inputRepos" value="${inputRepos}" />
+ <ant antfile="build.xml">
+ <property name="JBT_VERSION" value="${JBT_VERSION}" />
+ <property name="BUILD_ALIAS" value="${BUILD_ALIAS}" />
+ </ant>
</tasks>
</configuration>
<goals>
Modified: trunk/build/aggregate/soa-site/pom.xml
===================================================================
--- trunk/build/aggregate/soa-site/pom.xml 2011-09-22 23:04:49 UTC (rev 34979)
+++ trunk/build/aggregate/soa-site/pom.xml 2011-09-22 23:13:54 UTC (rev 34980)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools</groupId>
@@ -12,14 +13,13 @@
<version>0.0.1-SNAPSHOT</version>
<packaging>eclipse-update-site</packaging>
- <!-- to build against locally built sources, use:
- mvn clean install
- to build against http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/, use:
- mvn clean install -Pjbosstools-nightly-staging-composite
- -->
+ <!-- to build against locally built sources, use: mvn clean install to build
+ against http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/,
+ use: mvn clean install -Pjbosstools-nightly-staging-composite -->
<properties>
- <!-- add more inputRepos into the composite metadata at the URL below. Therefore need not edit this file and add dozens of URLs
- which need to be called by Ant script later -->
+ <!-- add more inputRepos into the composite metadata at the URL below.
+ Therefore need not edit this file and add dozens of URLs which need to be
+ called by Ant script later -->
<!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo -->
<inputRepo1>http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/</inputRepo1>
<inputRepos>1</inputRepos>
@@ -39,11 +39,12 @@
<quiet>true</quiet>
<tasks>
<!-- called AFTER generating update site + zip to add in extra content -->
- <property name="inputRepo1" value="${inputRepo1}"/>
- <property name="inputRepos" value="${inputRepos}"/>
- <property name="JBT_VERSION" value="${JBT_VERSION}"/>
- <property name="BUILD_ALIAS" value="${BUILD_ALIAS}"/>
- <ant antfile="build.xml"/>
+ <property name="inputRepo1" value="${inputRepo1}" />
+ <property name="inputRepos" value="${inputRepos}" />
+ <ant antfile="build.xml">
+ <property name="JBT_VERSION" value="${JBT_VERSION}" />
+ <property name="BUILD_ALIAS" value="${BUILD_ALIAS}" />
+ </ant>
</tasks>
</configuration>
<goals>
14 years, 6 months
JBoss Tools SVN: r34979 - trunk/build/aggregate/webtools-site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-09-22 19:04:49 -0400 (Thu, 22 Sep 2011)
New Revision: 34979
Modified:
trunk/build/aggregate/webtools-site/index.html
trunk/build/aggregate/webtools-site/pom.xml
Log:
nest ant properties in the <ant> call so they get passed through to ant; doesn't work to declare them outside the <ant> call (JBIDE-9743)
Modified: trunk/build/aggregate/webtools-site/index.html
===================================================================
--- trunk/build/aggregate/webtools-site/index.html 2011-09-22 22:49:23 UTC (rev 34978)
+++ trunk/build/aggregate/webtools-site/index.html 2011-09-22 23:04:49 UTC (rev 34979)
@@ -1,6 +1,6 @@
<html>
<head>
-<title>JBoss Tools - Web Tools - Nightly Build Update Site: 3.3_trunk.webtools.2011-12-12_19-10-45-H6970</title>
+<title>JBoss Tools - Web Tools - Nightly Build Update Site: 3.3.0.v20110919-1910-H6969-M4.webtools</title>
<style>
@import url("http://download.jboss.org/jbosstools/updates/web/site.css");
</style>
@@ -24,7 +24,7 @@
<h2 class="title">JBoss Tools - Web Tools - Nightly Build Update Site</h2>
<table width="100%">
<tr class="header">
- <td class="sub-header" width="100%"><span>Latest Build: 3.3_trunk.webtools.2011-12-12_19-10-45-H6970</span></td>
+ <td class="sub-header" width="100%"><span>Latest Build: 3.3.0.v20110919-1910-H6969-M4.webtools</span></td>
</tr>
<tr class="light-row" style="height: 30px">
@@ -78,50 +78,50 @@
</th>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.ide.eclipse.archives.feature_3.2.1.v20110916-0117-M4.jar" style="font-size:x-small">org.jboss.ide.eclipse.archives.feature</a></td>
- <td><span style="font-size:x-small">3.2.1.v20110916-0117-M4</span></td>
+ <td class="rowLine"><a href="features/org.jboss.ide.eclipse.archives.feature_3.2.1.v20110922-1517-M4.jar" style="font-size:x-small">org.jboss.ide.eclipse.archives.feature</a></td>
+ <td><span style="font-size:x-small">3.2.1.v20110922-1517-M4</span></td>
<td><span style="font-size:x-small">
|
org.eclipse.wst.server.core.serverAdapter</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.archives.integration_2.3.0.v20110919-1521-M4.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.archives.integration</a></td>
- <td><span style="font-size:x-small">2.3.0.v20110919-1521-M4</span></td>
+ <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.archives.integration_2.3.0.v20110922-1752-M4.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.archives.integration</a></td>
+ <td><span style="font-size:x-small">2.3.0.v20110922-1752-M4</span></td>
<td><span style="font-size:x-small">
|
org.eclipse.wst.server.core.serverAdapter</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.feature_2.3.0.v20110919-1521-M4.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.feature</a></td>
- <td><span style="font-size:x-small">2.3.0.v20110919-1521-M4</span></td>
+ <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.feature_2.3.0.v20110922-1752-M4.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.feature</a></td>
+ <td><span style="font-size:x-small">2.3.0.v20110922-1752-M4</span></td>
<td><span style="font-size:x-small">
|
org.eclipse.wst.server.core.serverAdapter</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.jmx.integration_2.3.0.v20110919-1521-M4.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.jmx.integration</a></td>
- <td><span style="font-size:x-small">2.3.0.v20110919-1521-M4</span></td>
+ <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.jmx.integration_2.3.0.v20110922-1752-M4.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.jmx.integration</a></td>
+ <td><span style="font-size:x-small">2.3.0.v20110922-1752-M4</span></td>
<td><span style="font-size:x-small">
|
org.eclipse.wst.server.core.serverAdapter</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.server.rse.integration_2.3.0.v20110919-1521-M4.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.server.rse.integration</a></td>
- <td><span style="font-size:x-small">2.3.0.v20110919-1521-M4</span></td>
+ <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.server.rse.integration_2.3.0.v20110922-1752-M4.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.server.rse.integration</a></td>
+ <td><span style="font-size:x-small">2.3.0.v20110922-1752-M4</span></td>
<td><span style="font-size:x-small">
|
org.eclipse.wst.server.core.serverAdapter</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.serverAdapter.wtp_2.3.0.v20110919-1521-M4.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.serverAdapter.wtp</a></td>
- <td><span style="font-size:x-small">2.3.0.v20110919-1521-M4</span></td>
+ <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.serverAdapter.wtp_2.3.0.v20110922-1752-M4.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.serverAdapter.wtp</a></td>
+ <td><span style="font-size:x-small">2.3.0.v20110922-1752-M4</span></td>
<td><span style="font-size:x-small">
|
org.eclipse.wst.server.core.serverAdapter</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.jmx.feature_1.2.0.v20110916-0116-M4.jar" style="font-size:x-small">org.jboss.tools.jmx.feature</a></td>
- <td><span style="font-size:x-small">1.2.0.v20110916-0116-M4</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.jmx.feature_1.2.0.v20110922-1517-M4.jar" style="font-size:x-small">org.jboss.tools.jmx.feature</a></td>
+ <td><span style="font-size:x-small">1.2.0.v20110922-1517-M4</span></td>
<td><span style="font-size:x-small">
|
org.eclipse.wst.server.core.serverAdapter</span></td>
Modified: trunk/build/aggregate/webtools-site/pom.xml
===================================================================
--- trunk/build/aggregate/webtools-site/pom.xml 2011-09-22 22:49:23 UTC (rev 34978)
+++ trunk/build/aggregate/webtools-site/pom.xml 2011-09-22 23:04:49 UTC (rev 34979)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools</groupId>
@@ -12,11 +13,9 @@
<version>0.0.1-SNAPSHOT</version>
<packaging>eclipse-update-site</packaging>
- <!-- to build against locally built sources, use:
- mvn clean install
- to build against http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/, use:
- mvn clean install -Pjbosstools-nightly-staging-composite
- -->
+ <!-- to build against locally built sources, use: mvn clean install to build
+ against http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/,
+ use: mvn clean install -Pjbosstools-nightly-staging-composite -->
<build>
<plugins>
<plugin>
@@ -31,9 +30,10 @@
<quiet>true</quiet>
<tasks>
<!-- called AFTER generating update site + zip to add in extra content -->
- <!-- <property name="JBT_VERSION" value="${JBT_VERSION}"/>
- <property name="BUILD_ALIAS" value="${BUILD_ALIAS}"/> -->
- <ant antfile="build.xml"/>
+ <ant antfile="build.xml">
+ <property name="JBT_VERSION" value="${JBT_VERSION}" />
+ <property name="BUILD_ALIAS" value="${BUILD_ALIAS}" />
+ </ant>
</tasks>
</configuration>
<goals>
14 years, 6 months