JBoss Tools SVN: r24065 - trunk/vpe/plugins/org.jboss.tools.vpe.spring.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2010-08-11 15:25:25 -0400 (Wed, 11 Aug 2010)
New Revision: 24065
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.spring/pom.xml
Log:
pom groupId updated in vpe.spring plugin
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.spring/pom.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.spring/pom.xml 2010-08-11 19:18:21 UTC (rev 24064)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.spring/pom.xml 2010-08-11 19:25:25 UTC (rev 24065)
@@ -7,7 +7,7 @@
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools.spring.plugins</groupId>
+ <groupId>org.jboss.tools.vpe.plugins</groupId>
<artifactId>org.jboss.tools.vpe.spring</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
15 years, 5 months
JBoss Tools SVN: r24064 - trunk/build.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-08-11 15:18:21 -0400 (Wed, 11 Aug 2010)
New Revision: 24064
Modified:
trunk/build/publish.sh
Log:
collect list of zips per build in zip.list.txt metafile
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2010-08-11 17:53:14 UTC (rev 24063)
+++ trunk/build/publish.sh 2010-08-11 19:18:21 UTC (rev 24064)
@@ -90,6 +90,14 @@
done
fi
+METAFILE=zip.list.txt
+echo "ALL_ZIPS = \\" >> ${STAGINGDIR}/logs/${METAFILE}
+for z in $(find ${STAGINGDIR} -name "*Update*.zip") $(find ${STAGINGDIR} -name "*Sources*.zip"); do
+ # list zips in staging dir
+ echo "${z##${STAGINGDIR}/},\\" >> ${STAGINGDIR}/logs/${METAFILE}
+done
+echo "" >> ${STAGINGDIR}/logs/${METAFILE}
+
# create sources zip
pushd ${WORKSPACE}/sources
mkdir -p ${STAGINGDIR}/all
15 years, 5 months
JBoss Tools SVN: r24063 - in branches/smooks-dmb: plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core and 4 other directories.
by jbosstools-commits@lists.jboss.org
Author: tfennelly
Date: 2010-08-11 13:53:14 -0400 (Wed, 11 Aug 2010)
New Revision: 24063
Modified:
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/model/smooks-core.ecore
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/CorePackage.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/GlobalParams.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/IGlobalParams.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/IParams.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/Params.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/dbm/editor/SmooksConfigurationFormPage.java
branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/.project
branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/core/ParamsTest.java
Log:
https://jira.jboss.org/browse/JBIDE-6818
Update IParams to allow lookups by type
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/model/smooks-core.ecore
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/model/smooks-core.ecore 2010-08-11 17:18:13 UTC (rev 24062)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/model/smooks-core.ecore 2010-08-11 17:53:14 UTC (rev 24063)
@@ -1,30 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="core"
- nsURI="http://www.milyn.org/smooks-core/core/1.0.0" nsPrefix="smooks.core">
- <eClassifiers xsi:type="ecore:EClass" name="Param">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Params">
- <eOperations name="getParam" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eParameters name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eOperations>
- <eOperations name="setParam" lowerBound="1" eType="#//Params">
- <eParameters name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eParameters name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eOperations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="params" upperBound="-1"
- eType="#//Param"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="GlobalParams" eSuperTypes="#//Params">
- <eOperations name="setFilterType" eType="#//GlobalParams">
- <eParameters name="filterType" eType="#//StreamFilterType"/>
- </eOperations>
- <eOperations name="getFilterType" eType="#//StreamFilterType"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EDataType" name="StreamFilterType" instanceClassName="org.milyn.StreamFilterType"/>
- <eClassifiers xsi:type="ecore:EClass" name="Component" abstract="true" interface="true"/>
-</ecore:EPackage>
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0"
+ xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="core"
+ nsURI="http://www.milyn.org/smooks-core/core/1.0.0" nsPrefix="smooks.core">
+ <eClassifiers xsi:type="ecore:EClass" name="Param">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Params">
+ <eOperations name="setParam" lowerBound="1" eType="#//Params">
+ <eParameters name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eParameters name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eOperations>
+ <eOperations name="setParam" eType="#//Params">
+ <eParameters name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eParameters name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eParameters name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eOperations>
+ <eOperations name="getParam" eType="#//Param">
+ <eParameters name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eOperations>
+ <eOperations name="getParam" eType="#//Param">
+ <eParameters name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eParameters name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eOperations>
+ <eOperations name="getParamValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eParameters name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eOperations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="params" upperBound="-1"
+ eType="#//Param"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GlobalParams" eSuperTypes="#//Params">
+ <eOperations name="setFilterType" eType="#//GlobalParams">
+ <eParameters name="filterType" eType="#//StreamFilterType"/>
+ </eOperations>
+ <eOperations name="getFilterType" eType="#//StreamFilterType"/>
+ <eOperations name="isDefaultSerializationOn" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eOperations name="setDefaultSerializationOn" eType="#//GlobalParams">
+ <eParameters name="defaultSerializationOn" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ </eOperations>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EDataType" name="StreamFilterType" instanceClassName="org.milyn.StreamFilterType"/>
+ <eClassifiers xsi:type="ecore:EClass" name="Component" abstract="true" interface="true"/>
+</ecore:EPackage>
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/CorePackage.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/CorePackage.java 2010-08-11 17:18:13 UTC (rev 24062)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/CorePackage.java 2010-08-11 17:53:14 UTC (rev 24063)
@@ -292,13 +292,25 @@
initEClass(paramsEClass, IParams.class, "Params", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getParams_Params(), this.getParam(), null, "params", null, 0, -1, IParams.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- EOperation op = addEOperation(paramsEClass, ecorePackage.getEString(), "getParam", 0, 1, IS_UNIQUE, IS_ORDERED);
+ EOperation op = addEOperation(paramsEClass, this.getParams(), "setParam", 1, 1, IS_UNIQUE, IS_ORDERED);
addEParameter(op, ecorePackage.getEString(), "name", 1, 1, IS_UNIQUE, IS_ORDERED);
+ addEParameter(op, ecorePackage.getEString(), "value", 0, 1, IS_UNIQUE, IS_ORDERED);
- op = addEOperation(paramsEClass, this.getParams(), "setParam", 1, 1, IS_UNIQUE, IS_ORDERED);
- addEParameter(op, ecorePackage.getEString(), "name", 1, 1, IS_UNIQUE, IS_ORDERED);
+ op = addEOperation(paramsEClass, this.getParams(), "setParam", 0, 1, IS_UNIQUE, IS_ORDERED);
+ addEParameter(op, ecorePackage.getEString(), "name", 0, 1, IS_UNIQUE, IS_ORDERED);
addEParameter(op, ecorePackage.getEString(), "value", 0, 1, IS_UNIQUE, IS_ORDERED);
+ addEParameter(op, ecorePackage.getEString(), "type", 0, 1, IS_UNIQUE, IS_ORDERED);
+ op = addEOperation(paramsEClass, this.getParam(), "getParam", 0, 1, IS_UNIQUE, IS_ORDERED);
+ addEParameter(op, ecorePackage.getEString(), "name", 0, 1, IS_UNIQUE, IS_ORDERED);
+
+ op = addEOperation(paramsEClass, this.getParam(), "getParam", 0, 1, IS_UNIQUE, IS_ORDERED);
+ addEParameter(op, ecorePackage.getEString(), "name", 0, 1, IS_UNIQUE, IS_ORDERED);
+ addEParameter(op, ecorePackage.getEString(), "type", 0, 1, IS_UNIQUE, IS_ORDERED);
+
+ op = addEOperation(paramsEClass, ecorePackage.getEString(), "getParamValue", 0, 1, IS_UNIQUE, IS_ORDERED);
+ addEParameter(op, ecorePackage.getEString(), "name", 1, 1, IS_UNIQUE, IS_ORDERED);
+
initEClass(globalParamsEClass, IGlobalParams.class, "GlobalParams", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
op = addEOperation(globalParamsEClass, this.getGlobalParams(), "setFilterType", 0, 1, IS_UNIQUE, IS_ORDERED);
@@ -306,6 +318,11 @@
addEOperation(globalParamsEClass, this.getStreamFilterType(), "getFilterType", 0, 1, IS_UNIQUE, IS_ORDERED);
+ addEOperation(globalParamsEClass, ecorePackage.getEBoolean(), "isDefaultSerializationOn", 0, 1, IS_UNIQUE, IS_ORDERED);
+
+ op = addEOperation(globalParamsEClass, this.getGlobalParams(), "setDefaultSerializationOn", 0, 1, IS_UNIQUE, IS_ORDERED);
+ addEParameter(op, ecorePackage.getEBoolean(), "defaultSerializationOn", 0, 1, IS_UNIQUE, IS_ORDERED);
+
initEClass(componentEClass, IComponent.class, "Component", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
// Initialize data types
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/GlobalParams.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/GlobalParams.java 2010-08-11 17:18:13 UTC (rev 24062)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/GlobalParams.java 2010-08-11 17:53:14 UTC (rev 24063)
@@ -56,7 +56,7 @@
* @generated NOT
*/
public StreamFilterType getFilterType() {
- String filterType = getParam(Filter.STREAM_FILTER_TYPE);
+ String filterType = getParamValue(Filter.STREAM_FILTER_TYPE);
if(filterType == null) {
return null;
@@ -69,4 +69,33 @@
}
}
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated NOT
+ */
+ public IGlobalParams setDefaultSerializationOn(boolean defaultSerializationOn) {
+ setParam(Filter.DEFAULT_SERIALIZATION_ON, Boolean.toString(defaultSerializationOn));
+ return this;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated NOT
+ */
+ public boolean isDefaultSerializationOn() {
+ String defaultSerializationOn = getParamValue(Filter.DEFAULT_SERIALIZATION_ON);
+
+ if(defaultSerializationOn == null) {
+ return true;
+ }
+
+ try {
+ // On, unless it's explicitly turned off...
+ return !defaultSerializationOn.equals("false");
+ } catch(Exception e) {
+ return true;
+ }
+ }
} //GlobalParams
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/IGlobalParams.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/IGlobalParams.java 2010-08-11 17:18:13 UTC (rev 24062)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/IGlobalParams.java 2010-08-11 17:53:14 UTC (rev 24063)
@@ -35,4 +35,20 @@
*/
StreamFilterType getFilterType();
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @model kind="operation"
+ * @generated
+ */
+ boolean isDefaultSerializationOn();
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @model
+ * @generated
+ */
+ IGlobalParams setDefaultSerializationOn(boolean defaultSerializationOn);
+
} // IGlobalParams
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/IParams.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/IParams.java 2010-08-11 17:18:13 UTC (rev 24062)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/IParams.java 2010-08-11 17:53:14 UTC (rev 24063)
@@ -46,10 +46,26 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ * @model
+ * @generated
+ */
+ IParam getParam(String name);
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @model
+ * @generated
+ */
+ IParam getParam(String name, String type);
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @model nameRequired="true"
* @generated
*/
- String getParam(String name);
+ String getParamValue(String name);
/**
* <!-- begin-user-doc -->
@@ -59,4 +75,12 @@
*/
IParams setParam(String name, String value);
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @model
+ * @generated
+ */
+ IParams setParam(String name, String value, String type);
+
} // IParams
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/Params.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/Params.java 2010-08-11 17:18:13 UTC (rev 24062)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/Params.java 2010-08-11 17:53:14 UTC (rev 24063)
@@ -6,9 +6,6 @@
*/
package org.jboss.tools.smooks.model.core;
-
-
-import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
@@ -81,15 +78,28 @@
* <!-- end-user-doc -->
* @generated NOT
*/
- public String getParam(String name) {
+ public IParam getParam(String name) {
+ return getParam(name, null);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated NOT
+ */
+ public IParam getParam(String name, String type) {
if(params == null) {
return null;
}
for(IParam param : params) {
String paramName = param.getName();
+ String paramType = param.getType();
if(paramName != null && paramName.equals(name)) {
- return param.getValue();
+ if(type != null && !type.equals(paramType)) {
+ continue;
+ }
+ return param;
}
}
@@ -101,7 +111,31 @@
* <!-- end-user-doc -->
* @generated NOT
*/
- public Params setParam(String name, String value) {
+ public String getParamValue(String name) {
+ IParam param = getParam(name);
+
+ if(param == null) {
+ return null;
+ }
+
+ return param.getValue();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated NOT
+ */
+ public IParams setParam(String name, String value) {
+ return setParam(name, value, null);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated NOT
+ */
+ public IParams setParam(String name, String value, String type) {
if(params == null) {
params = new BasicEList<IParam>();
}
@@ -111,6 +145,7 @@
Param newParam = new Param();
newParam.setName(name);
newParam.setValue(value);
+ newParam.setType(type);
params.add(newParam);
return this;
@@ -121,7 +156,7 @@
* <!-- end-user-doc -->
* @generated NOT
*/
- public Params removeParam(String name) {
+ public IParams removeParam(String name) {
if(params == null) {
return this;
}
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2010-08-11 17:18:13 UTC (rev 24062)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2010-08-11 17:53:14 UTC (rev 24063)
@@ -136,19 +136,7 @@
SmooksModel rootModel = resourceList.getModelRoot();
GlobalParams params = rootModel.getParams();
if (params != null) {
- EList<IParam> paramList = params.getParams();
-
- for (Iterator<?> iterator = paramList.iterator(); iterator
- .hasNext();) {
- IParam paramType = (IParam) iterator.next();
- String name = paramType.getName();
- String value = paramType.getValue();
- if (inputType.getType().equals(name)
- && inputType.getPath().equals(value)) {
- // find the associated param
- return paramType;
- }
- }
+ return params.getParam(inputType.getType(), inputType.getPath());
}
return null;
}
@@ -156,14 +144,7 @@
public static IParam getInputTypeParam(SmooksModel resourceList) {
GlobalParams params = resourceList.getParams();
if (params != null) {
- List<IParam> paramList = params.getParams();
- for (Iterator<?> iterator = paramList.iterator(); iterator
- .hasNext();) {
- IParam paramType = (IParam) iterator.next();
- if (SmooksModelUtils.INPUT_TYPE.equals(paramType.getName())) {
- return paramType;
- }
- }
+ return params.getParam(SmooksModelUtils.INPUT_TYPE);
}
return null;
}
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/dbm/editor/SmooksConfigurationFormPage.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/dbm/editor/SmooksConfigurationFormPage.java 2010-08-11 17:18:13 UTC (rev 24062)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/dbm/editor/SmooksConfigurationFormPage.java 2010-08-11 17:53:14 UTC (rev 24063)
@@ -38,10 +38,12 @@
import org.jboss.tools.smooks.editor.ISourceSynchronizeListener;
import org.jboss.tools.smooks.graphical.editors.ISmooksEditorInitListener;
import org.jboss.tools.smooks.graphical.editors.SmooksMessage;
+import org.jboss.tools.smooks.model.core.GlobalParams;
import org.jboss.tools.smooks.model.core.ICorePackage;
import org.jboss.tools.smooks.model.core.IParam;
import org.jboss.tools.smooks.model.core.Param;
import org.jboss.tools.smooks.model.core.Params;
+import org.milyn.StreamFilterType;
/**
* @author Dart
@@ -256,7 +258,7 @@
}
- protected Params getParams(){
+ protected GlobalParams getParams(){
if(smooksModelProvider != null){
return smooksModelProvider.getSmooksModel().getModelRoot().getParams();
}
@@ -264,21 +266,18 @@
}
protected void initGlobalSettingControls() {
- Params m = getParams();
- if (m != null) {
- EList<IParam> parmList = m.getParams();
- for (int i = 0; i < parmList.size(); i++) {
- Param param = (Param) parmList.get(i);
- if (param.getName().equals("stream.filter.type")) { //$NON-NLS-1$
- streamFilterTypeCombo.setText(param.getValue());
- } else if (param.getName().equals("default.serialization.on")) { //$NON-NLS-1$
- Boolean boolValue = Boolean.valueOf(param.getValue());
- defaultSerializationOnCheckbox.setSelection(boolValue.booleanValue());
- }
+ // Set defaults first...
+ streamFilterTypeCombo.setText(StreamFilterType.SAX.name());
+ defaultSerializationOnCheckbox.setSelection(true);
+
+ GlobalParams globalParams = getParams();
+ if (globalParams != null) {
+ StreamFilterType filterType = globalParams.getFilterType();
+
+ if(filterType != null) {
+ streamFilterTypeCombo.setText(filterType.name());
}
- } else { // set defaults
- streamFilterTypeCombo.setText("SAX"); //$NON-NLS-1$
- defaultSerializationOnCheckbox.setSelection(true);
+ defaultSerializationOnCheckbox.setSelection(globalParams.isDefaultSerializationOn());
}
}
Modified: branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/.project
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/.project 2010-08-11 17:18:13 UTC (rev 24062)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/.project 2010-08-11 17:53:14 UTC (rev 24063)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.jboss.tools.smooks.core.test</name>
+ <name>org.jboss.tools.smooks.core.model.test</name>
<comment></comment>
<projects>
</projects>
Modified: branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/core/ParamsTest.java
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/core/ParamsTest.java 2010-08-11 17:18:13 UTC (rev 24062)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/core/ParamsTest.java 2010-08-11 17:53:14 UTC (rev 24063)
@@ -39,9 +39,9 @@
assertEquals(null, params.getParam("a"));
params.removeParam("a"); // make sure there's no exception
params.setParam("a", "aVal");
- assertEquals("aVal", params.getParam("a"));
+ assertEquals("aVal", params.getParamValue("a"));
params.setParam("a", "bVal");
- assertEquals("bVal", params.getParam("a"));
+ assertEquals("bVal", params.getParamValue("a"));
params.setFilterType(StreamFilterType.SAX);
assertTrue(params.getFilterType() == StreamFilterType.SAX);
params.setFilterType(StreamFilterType.DOM);
15 years, 5 months
JBoss Tools SVN: r24062 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: src/org/jboss/tools/deltacloud/ui and 2 other directories.
by jbosstools-commits@lists.jboss.org
Author: jjohnstn
Date: 2010-08-11 13:18:13 -0400 (Wed, 11 Aug 2010)
New Revision: 24062
Added:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/CustomProgressMonitorDialog.java
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CloudViewElement.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstancePropertySource.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstance.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties
Log:
2010-08-11 Jeff Johnston <jjohnstn(a)redhat.com>
* src/org/jboss/tools/deltacloud/ui/CustomProgressMonitorDialog.java: New file.
* src/org/jboss/tools/deltacloud/ui/views/CloudViewElement.java (getAdapter): Fix warning.
* src/org/jboss/tools/deltacloud/ui/views/InstancePropertySource.java (InstancePropertySource): Ditto.
* src/org/jboss/tools/deltacloud/ui/views/InstanceView.java (selectedElement): Ditto.
* src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstance.java (performFinish): Fix to
run a Job to monitor the progress.
(WatchCreateJob): New private Job class to watch the instance creation.
* src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties: Add new
messages.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-08-11 16:09:28 UTC (rev 24061)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-08-11 17:18:13 UTC (rev 24062)
@@ -1,5 +1,17 @@
2010-08-11 Jeff Johnston <jjohnstn(a)redhat.com>
+ * src/org/jboss/tools/deltacloud/ui/CustomProgressMonitorDialog.java: New file.
+ * src/org/jboss/tools/deltacloud/ui/views/CloudViewElement.java (getAdapter): Fix warning.
+ * src/org/jboss/tools/deltacloud/ui/views/InstancePropertySource.java (InstancePropertySource): Ditto.
+ * src/org/jboss/tools/deltacloud/ui/views/InstanceView.java (selectedElement): Ditto.
+ * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstance.java (performFinish): Fix to
+ run a Job to monitor the progress.
+ (WatchCreateJob): New private Job class to watch the instance creation.
+ * src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties: Add new
+ messages.
+
+2010-08-11 Jeff Johnston <jjohnstn(a)redhat.com>
+
* build.properties: Add plugin.properties to bin list.
* src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties: New messages.
* src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java (fillContextMenu): Remove
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/CustomProgressMonitorDialog.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/CustomProgressMonitorDialog.java (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/CustomProgressMonitorDialog.java 2010-08-11 17:18:13 UTC (rev 24062)
@@ -0,0 +1,63 @@
+package org.jboss.tools.deltacloud.ui;
+
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+
+public class CustomProgressMonitorDialog extends ProgressMonitorDialog {
+
+ private Button checkbox;
+ private boolean checkboxValue;
+
+ private String okLabel;
+ private String checkboxLabel;
+
+ private SelectionListener listener = new SelectionAdapter() {
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ Button b = (Button)e.widget;
+ checkboxValue = b.getSelection();
+ }
+ };
+
+ public boolean getCheckboxValue() {
+ return checkboxValue;
+ }
+
+ public CustomProgressMonitorDialog(Shell parent, String okLabel,
+ String checkboxLabel, boolean checkboxValue) {
+ super(parent);
+ this.okLabel = okLabel;
+ this.checkboxLabel = checkboxLabel;
+ this.checkboxValue = checkboxValue;
+ }
+
+ protected void okPressed() {
+ // We need to cheat...we need to cancel the monitoring task
+ // so we can successfully close the dialog
+ cancelPressed();
+ setReturnCode(OK);
+ }
+
+ protected void createButtonsForButtonBar(Composite parent) {
+ createCancelButton(parent);
+ createButton(parent, IDialogConstants.OK_ID, okLabel, false);
+ }
+
+ protected Control createDialogArea(Composite parent) {
+ super.createDialogArea(parent);
+ checkbox = new Button(parent, SWT.CHECK);
+ checkbox.setText(checkboxLabel);
+ checkbox.setSelection(checkboxValue);
+ checkbox.addSelectionListener(listener);
+ return parent;
+ }
+
+}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CloudViewElement.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CloudViewElement.java 2010-08-11 16:09:28 UTC (rev 24061)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CloudViewElement.java 2010-08-11 17:18:13 UTC (rev 24062)
@@ -49,6 +49,7 @@
return element;
}
+ @SuppressWarnings("unchecked")
@Override
public Object getAdapter(Class adapter) {
if (adapter == IPropertySource.class) {
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstancePropertySource.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstancePropertySource.java 2010-08-11 16:09:28 UTC (rev 24061)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstancePropertySource.java 2010-08-11 17:18:13 UTC (rev 24062)
@@ -26,11 +26,8 @@
private IPropertyDescriptor[] propertyDescriptors;
private DeltaCloudInstance instance;
- private CVInstanceElement element;
-
public InstancePropertySource(CVInstanceElement element, Object o) {
instance = (DeltaCloudInstance)o;
- this.element = element;
}
@Override
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-08-11 16:09:28 UTC (rev 24061)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-08-11 17:18:13 UTC (rev 24062)
@@ -48,6 +48,7 @@
private TableViewer viewer;
private Composite container;
private Combo cloudSelector;
+ @SuppressWarnings("unused")
private DeltaCloudInstance selectedElement;
private DeltaCloud[] clouds;
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstance.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstance.java 2010-08-11 16:09:28 UTC (rev 24061)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstance.java 2010-08-11 17:18:13 UTC (rev 24062)
@@ -6,15 +6,12 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.core.runtime.preferences.InstanceScope;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.dialogs.MessageDialogWithToggle;
-import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.progress.IProgressService;
import org.jboss.tools.deltacloud.core.DeltaCloud;
import org.jboss.tools.deltacloud.core.DeltaCloudException;
import org.jboss.tools.deltacloud.core.DeltaCloudImage;
@@ -32,6 +29,7 @@
private final static String CONFIRM_CREATE_MSG = "ConfirmCreate.msg"; //$NON-NLS-1$
private final static String DONT_SHOW_THIS_AGAIN_MSG = "DontShowThisAgain.msg"; //$NON-NLS-1$
private final static String STARTING_INSTANCE_MSG = "StartingInstance.msg"; //$NON-NLS-1$
+ private final static String STARTING_INSTANCE_TITLE = "StartingInstance.title"; //$NON-NLS-1$
private NewInstancePage mainPage;
@@ -56,6 +54,48 @@
return mainPage.isPageComplete();
}
+
+ private class WatchCreateJob extends Job {
+
+ private DeltaCloud cloud;
+ private String instanceId;
+ private String instanceName;
+
+ public WatchCreateJob(String title, DeltaCloud cloud,
+ String instanceId, String instanceName) {
+ super(title);
+ this.cloud = cloud;
+ this.instanceId = instanceId;
+ this.instanceName = instanceName;
+ }
+
+ public IStatus run(IProgressMonitor pm) {
+ if (!pm.isCanceled()){
+ try {
+ pm.beginTask(WizardMessages.getFormattedString(STARTING_INSTANCE_MSG, new String[] {instanceName}), IProgressMonitor.UNKNOWN);
+ pm.worked(1);
+ boolean finished = false;
+ while (!finished && !pm.isCanceled()) {
+ DeltaCloudInstance instance = cloud.refreshInstance(instanceId);
+ if (!instance.getState().equals(DeltaCloudInstance.PENDING))
+ break;
+ Thread.sleep(400);
+ }
+
+ } catch (Exception e) {
+ // do nothing
+ } finally {
+ pm.done();
+ }
+ return Status.OK_STATUS;
+ }
+ else {
+ pm.done();
+ return Status.CANCEL_STATUS;
+ }
+ };
+ };
+
@Override
public boolean performFinish() {
String imageId = image.getId();
@@ -94,28 +134,11 @@
result = true;
final String instanceId = instance.getId();
final String instanceName = name;
- if (instance != null) {
- IWorkbench wb = PlatformUI.getWorkbench();
- IProgressService ps = wb.getProgressService();
- try {
- ps.busyCursorWhile(new IRunnableWithProgress() {
- public void run(IProgressMonitor pm) {
- pm.beginTask(WizardMessages.getFormattedString(STARTING_INSTANCE_MSG, new String[] {instanceName}), IProgressMonitor.UNKNOWN);
- pm.worked(1);
- try {
- for (int i = 0; i < 2; ++i) {
- instance = cloud.refreshInstance(instanceId);
- if (!instance.getState().equals(DeltaCloudInstance.PENDING))
- break;
- }
- } finally {
- pm.done();
- }
- }
- });
- } catch(Exception ex) {
- errorMessage = ex.getLocalizedMessage();
- }
+ if (instance != null && !instance.getState().equals(DeltaCloudInstance.PENDING)) {
+ Job job = new WatchCreateJob(WizardMessages.getString(STARTING_INSTANCE_TITLE),
+ cloud, instanceId, instanceName);
+ job.setUser(true);
+ job.schedule();
}
} catch (DeltaCloudException e) {
errorMessage = e.getLocalizedMessage();
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties 2010-08-11 16:09:28 UTC (rev 24061)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties 2010-08-11 17:18:13 UTC (rev 24062)
@@ -20,6 +20,10 @@
Realm.label=Realm:
Storage.label=Storage:
+BackGround.label=Run In Background
+AlwaysRunInBackground.msg=Always run in the background
+Progress.msg=Progress
+
None.response=None
Defaulted=Defaulted
@@ -42,4 +46,5 @@
NewInstance.title=Launch Instance
NewInstance.name=Launch Instance
+StartingInstance.title=Starting Instance
StartingInstance.msg=Starting Instance: {0}
\ No newline at end of file
15 years, 5 months
JBoss Tools SVN: r24061 - trunk/build/target-platform.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-08-11 12:09:28 -0400 (Wed, 11 Aug 2010)
New Revision: 24061
Modified:
trunk/build/target-platform/e36-wtp32.target
Log:
add trailing slash
Modified: trunk/build/target-platform/e36-wtp32.target
===================================================================
--- trunk/build/target-platform/e36-wtp32.target 2010-08-11 16:08:19 UTC (rev 24060)
+++ trunk/build/target-platform/e36-wtp32.target 2010-08-11 16:09:28 UTC (rev 24061)
@@ -109,7 +109,7 @@
<unit id="org.eclipse.equinox.p2.ui.admin.rcp.product" version="1.1.0.I20100608-0911"/>
<unit id="org.eclipse.equinox.server.servletbridge.feature.group" version="1.0.0.v20100510-42A79oB5855K5E"/>
<unit id="org.eclipse.equinox.server.simple.feature.group" version="1.0.0.v20100510-44DF8s734C48662444"/>
-<repository location="http://download.eclipse.org/eclipse/updates/3.6"/>
+<repository location="http://download.eclipse.org/eclipse/updates/3.6/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit id="org.eclipse.birt.feature.group" version="2.6.0.v20100617-9gF727DGKb0yl9AwWxpmbo35PwQ_"/>
15 years, 5 months
JBoss Tools SVN: r24058 - in trunk: build/parent and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-08-11 11:59:15 -0400 (Wed, 11 Aug 2010)
New Revision: 24058
Modified:
trunk/build/parent/pom.xml
trunk/build/target-platform/e36-wtp32.target
trunk/parent-pom.xml
Log:
move mirrors down one dir; add new swtbot + webtools mirrors; remove galileo target
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2010-08-11 15:44:19 UTC (rev 24057)
+++ trunk/build/parent/pom.xml 2010-08-11 15:59:15 UTC (rev 24058)
@@ -184,9 +184,9 @@
<activeByDefault>false</activeByDefault>
</activation>
<repositories>
- <repository>
- <id>helios-jboss-mirror</id>
- <url>http://download.jboss.org/jbosstools/updates/helios/</url>
+ <!--repository>
+ <id>helios</id>
+ <url>http://download.eclipse.org/releases/helios/</url>
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>
@@ -194,10 +194,10 @@
<releases>
<enabled>true</enabled>
</releases>
- </repository>
+ </repository-->
<repository>
- <id>helios</id>
- <url>http://download.eclipse.org/releases/helios/</url>
+ <id>jboss-helios</id>
+ <url>http://download.jboss.org/jbosstools/updates/requirements/helios/</url>
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>
@@ -206,7 +206,7 @@
<enabled>true</enabled>
</releases>
</repository>
- <repository>
+ <!--repository>
<id>webtools32</id>
<url>http://download.eclipse.org/webtools/repository/helios</url>
<layout>p2</layout>
@@ -216,11 +216,10 @@
<releases>
<enabled>true</enabled>
</releases>
- </repository>
+ </repository-->
<repository>
- <id>birt26</id>
- <url>http://download.eclipse.org/birt/update-site/2.6/
- </url>
+ <id>jboss-webtools32</id>
+ <url>http://download.jboss.org/jbosstools/updates/requirements/webtools-3.2/</url>
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>
@@ -230,8 +229,8 @@
</releases>
</repository>
<repository>
- <id>swtbot-helios</id>
- <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/
+ <id>birt26</id>
+ <url>http://download.eclipse.org/birt/update-site/2.6/
</url>
<layout>p2</layout>
<snapshots>
@@ -241,9 +240,10 @@
<enabled>true</enabled>
</releases>
</repository>
- <repository>
- <id>m2eclipse</id>
- <url>http://m2eclipse.sonatype.org/sites/m2e/</url>
+ <!--repository>
+ <id>swtbot-helios</id>
+ <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/
+ </url>
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>
@@ -251,10 +251,11 @@
<releases>
<enabled>true</enabled>
</releases>
- </repository>
+ </repository-->
<repository>
- <id>m2eclipse-extras</id>
- <url>http://m2eclipse.sonatype.org/sites/m2e-extras/</url>
+ <id>jboss-swtbot-helios</id>
+ <url>http://download.jboss.org/jbosstools/updates/requirements/swtbot-helios/
+ </url>
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>
@@ -264,9 +265,8 @@
</releases>
</repository>
<repository>
- <id>orbit</id>
- <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/u...
- </url>
+ <id>m2eclipse</id>
+ <url>http://m2eclipse.sonatype.org/sites/m2e/</url>
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>
@@ -276,9 +276,8 @@
</releases>
</repository>
<repository>
- <id>jboss-xulrunner-1.9.1.2</id>
- <url>http://download.jboss.org/jbosstools/updates/xulrunner-1.9.1.2/
- </url>
+ <id>m2eclipse-extras</id>
+ <url>http://m2eclipse.sonatype.org/sites/m2e-extras/</url>
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>
@@ -288,8 +287,8 @@
</releases>
</repository>
<!--repository>
- <id>jboss-xulrunner-1.9.2</id>
- <url>http://download.jboss.org/jbosstools/updates/xulrunner-1.9.2/
+ <id>jboss-orbit</id>
+ <url>http://download.jboss.org/jbosstools/updates/requirements/orbit/R20100519...
</url>
<layout>p2</layout>
<snapshots>
@@ -300,61 +299,8 @@
</releases>
</repository-->
<repository>
- <id>google eclipse plugins</id>
- <url>http://dl.google.com/eclipse/plugin/3.6</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
- </profile>
-
- <profile>
- <id>helios-sp1-no-target</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <repositories>
- <repository>
- <id>helios-jboss-mirror</id>
- <url>http://download.jboss.org/jbosstools/updates/helios/</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>helios</id>
- <url>http://download.eclipse.org/releases/helios/</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>webtools32</id>
- <url>http://download.eclipse.org/webtools/repository/helios</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>eclipse36</id>
- <url>http://download.eclipse.org/eclipse/updates/3.6.x/
+ <id>jboss-thirdparty</id>
+ <url>http://download.jboss.org/jbosstools/updates/requirements/thirdparty/
</url>
<layout>p2</layout>
<snapshots>
@@ -365,8 +311,8 @@
</releases>
</repository>
<repository>
- <id>birt26</id>
- <url>http://download.eclipse.org/birt/update-site/2.6/
+ <id>jboss-xulrunner-1.9.1.2</id>
+ <url>http://download.jboss.org/jbosstools/updates/requirements/xulrunner-1.9.1.2/
</url>
<layout>p2</layout>
<snapshots>
@@ -376,9 +322,9 @@
<enabled>true</enabled>
</releases>
</repository>
- <repository>
- <id>swtbot-helios</id>
- <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/
+ <!--repository>
+ <id>jboss-xulrunner-1.9.2</id>
+ <url>http://download.jboss.org/jbosstools/updates/requirements/xulrunner-1.9.2/
</url>
<layout>p2</layout>
<snapshots>
@@ -387,10 +333,10 @@
<releases>
<enabled>true</enabled>
</releases>
- </repository>
+ </repository-->
<repository>
- <id>m2eclipse</id>
- <url>http://m2eclipse.sonatype.org/sites/m2e/</url>
+ <id>google eclipse plugins</id>
+ <url>http://dl.google.com/eclipse/plugin/3.6</url>
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>
@@ -399,20 +345,18 @@
<enabled>true</enabled>
</releases>
</repository>
+ </repositories>
+ </profile>
+
+ <profile>
+ <id>helios-maintenance-no-target</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <repositories>
<repository>
- <id>m2eclipse-extras</id>
- <url>http://m2eclipse.sonatype.org/sites/m2e-extras/</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>orbit</id>
- <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/u...
+ <id>eclipse36x</id>
+ <url>http://download.eclipse.org/eclipse/updates/3.6.x/
</url>
<layout>p2</layout>
<snapshots>
@@ -422,17 +366,6 @@
<enabled>true</enabled>
</releases>
</repository>
- <repository>
- <id>google eclipse plugins</id>
- <url>http://dl.google.com/eclipse/plugin/3.6</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
</repositories>
</profile>
@@ -510,99 +443,6 @@
</repositories>
</profile>
<profile>
- <id>galileo</id>
- <repositories>
- <repository>
- <id>galileo</id>
- <url>http://download.eclipse.org/releases/galileo/</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>eclipse35</id>
- <url>http://download.eclipse.org/eclipse/updates/3.5/</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>birt25r</id>
- <url>http://download.eclipse.org/birt/update-site/2.5</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>swtbot-galileo</id>
- <url>http://download.eclipse.org/technology/swtbot/galileo/dev-build/update-site
- </url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>webtools</id>
- <url>http://download.eclipse.org/webtools/updates/</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>orbit</id>
- <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/u...
- </url>
- <layout>p2</layout>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
-
- <repository>
- <id>m2eclipse</id>
- <url>http://m2eclipse.sonatype.org/sites/m2e/</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>m2eclipse-extras</id>
- <url>http://m2eclipse.sonatype.org/sites/m2e-extras/</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
- </profile>
- <profile>
<id>coverage</id>
<activation>
<property>
Modified: trunk/build/target-platform/e36-wtp32.target
===================================================================
--- trunk/build/target-platform/e36-wtp32.target 2010-08-11 15:44:19 UTC (rev 24057)
+++ trunk/build/target-platform/e36-wtp32.target 2010-08-11 15:59:15 UTC (rev 24058)
@@ -23,22 +23,22 @@
<!-- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit id="javax.wsdl" version="1.6.2.v201005080631"/>
<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
-<repository location="http://download.jboss.org/jbosstools/updates/orbit/R20100519200754/"/>
+<repository location="http://download.jboss.org/jbosstools/updates/requirements/orbit/R20100519..."/>
</location> -->
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit id="javax.wsdl" version="1.6.2.v201005080631"/>
<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
-<repository location="http://download.jboss.org/jbosstools/updates/thirdparty/"/>
+<repository location="http://download.jboss.org/jbosstools/updates/requirements/thirdparty/"/>
</location>
<!-- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit id="org.mozilla.xulrunner.feature.feature.group" version="1.9.2"/>
<unit id="org.mozilla.xpcom.feature.feature.group" version="1.9.2"/>
-<repository location="http://download.jboss.org/jbosstools/updates/xulrunner-1.9.2/"/>
+<repository location="http://download.jboss.org/jbosstools/updates/requirements/xulrunner-1.9.2/"/>
</location> -->
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit id="org.mozilla.xulrunner.feature.feature.group" version="1.9.1.2"/>
<unit id="org.mozilla.xpcom.feature.feature.group" version="1.9.1.2a"/>
-<repository location="http://download.jboss.org/jbosstools/updates/xulrunner-1.9.1.2/"/>
+<repository location="http://download.jboss.org/jbosstools/updates/requirements/xulrunner-1.9.1.2/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<repository location="http://download.eclipse.org/rt/ecf/3.2/3.6/site.p2"/>
@@ -120,7 +120,7 @@
<unit id="org.eclipse.draw2d.feature.group" version="3.6.0.v20100519-2050-45-7w3121163602336"/>
<unit id="org.eclipse.gef.feature.group" version="3.6.0.v20100519-2050-777B-81A2Bz-69793A8B83447"/>
<unit id="org.eclipse.zest.feature.group" version="1.2.0.v20100519-2050-678-8yE4F-8HAH4DFEF3447"/>
-<repository location="http://download.jboss.org/jbosstools/updates/helios/"/>
+<repository location="http://download.jboss.org/jbosstools/updates/requirements/helios/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit id="org.eclipse.jst.jee" version="1.0.300.v201005191301"/>
@@ -160,7 +160,8 @@
<unit id="org.eclipse.wst.web_core.feature.feature.group" version="3.2.0.v201005241510-7E7AFHkAJrn5NL_6wTQDqKL5RwiQ"/>
<unit id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.2.0.v201005241510-7I78FXbEtEoKvbtBtJ4fGNrH2oBH"/>
<unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.2.0.v201005241510-7C7OFXTF7RZHQHHxO4IuKe"/>
-<repository location="http://download.eclipse.org/webtools/downloads/drops/R3.2.0/R-3.2.0-20100..."/>
+<!--repository location="http://download.eclipse.org/webtools/downloads/drops/R3.2.0/R-3.2.0-20100..."/ -->
+<repository location="http://download.jboss.org/jbosstools/updates/requirements/webtools-3.2.0/"/>
</location>
</locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
Modified: trunk/parent-pom.xml
===================================================================
--- trunk/parent-pom.xml 2010-08-11 15:44:19 UTC (rev 24057)
+++ trunk/parent-pom.xml 2010-08-11 15:59:15 UTC (rev 24058)
@@ -184,9 +184,9 @@
<activeByDefault>false</activeByDefault>
</activation>
<repositories>
- <repository>
- <id>helios-jboss-mirror</id>
- <url>http://download.jboss.org/jbosstools/updates/helios/</url>
+ <!--repository>
+ <id>helios</id>
+ <url>http://download.eclipse.org/releases/helios/</url>
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>
@@ -194,10 +194,10 @@
<releases>
<enabled>true</enabled>
</releases>
- </repository>
+ </repository-->
<repository>
- <id>helios</id>
- <url>http://download.eclipse.org/releases/helios/</url>
+ <id>jboss-helios</id>
+ <url>http://download.jboss.org/jbosstools/updates/requirements/helios/</url>
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>
@@ -206,7 +206,7 @@
<enabled>true</enabled>
</releases>
</repository>
- <repository>
+ <!--repository>
<id>webtools32</id>
<url>http://download.eclipse.org/webtools/repository/helios</url>
<layout>p2</layout>
@@ -216,11 +216,10 @@
<releases>
<enabled>true</enabled>
</releases>
- </repository>
+ </repository-->
<repository>
- <id>birt26</id>
- <url>http://download.eclipse.org/birt/update-site/2.6/
- </url>
+ <id>jboss-webtools32</id>
+ <url>http://download.jboss.org/jbosstools/updates/requirements/webtools-3.2/</url>
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>
@@ -230,8 +229,8 @@
</releases>
</repository>
<repository>
- <id>swtbot-helios</id>
- <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/
+ <id>birt26</id>
+ <url>http://download.eclipse.org/birt/update-site/2.6/
</url>
<layout>p2</layout>
<snapshots>
@@ -241,9 +240,10 @@
<enabled>true</enabled>
</releases>
</repository>
- <repository>
- <id>m2eclipse</id>
- <url>http://m2eclipse.sonatype.org/sites/m2e/</url>
+ <!--repository>
+ <id>swtbot-helios</id>
+ <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/
+ </url>
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>
@@ -251,10 +251,11 @@
<releases>
<enabled>true</enabled>
</releases>
- </repository>
+ </repository-->
<repository>
- <id>m2eclipse-extras</id>
- <url>http://m2eclipse.sonatype.org/sites/m2e-extras/</url>
+ <id>jboss-swtbot-helios</id>
+ <url>http://download.jboss.org/jbosstools/updates/requirements/swtbot-helios/
+ </url>
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>
@@ -264,9 +265,8 @@
</releases>
</repository>
<repository>
- <id>orbit</id>
- <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/u...
- </url>
+ <id>m2eclipse</id>
+ <url>http://m2eclipse.sonatype.org/sites/m2e/</url>
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>
@@ -276,9 +276,8 @@
</releases>
</repository>
<repository>
- <id>jboss-xulrunner-1.9.1.2</id>
- <url>http://download.jboss.org/jbosstools/updates/xulrunner-1.9.1.2/
- </url>
+ <id>m2eclipse-extras</id>
+ <url>http://m2eclipse.sonatype.org/sites/m2e-extras/</url>
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>
@@ -288,8 +287,8 @@
</releases>
</repository>
<!--repository>
- <id>jboss-xulrunner-1.9.2</id>
- <url>http://download.jboss.org/jbosstools/updates/xulrunner-1.9.2/
+ <id>jboss-orbit</id>
+ <url>http://download.jboss.org/jbosstools/updates/requirements/orbit/R20100519...
</url>
<layout>p2</layout>
<snapshots>
@@ -300,61 +299,8 @@
</releases>
</repository-->
<repository>
- <id>google eclipse plugins</id>
- <url>http://dl.google.com/eclipse/plugin/3.6</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
- </profile>
-
- <profile>
- <id>helios-sp1-no-target</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <repositories>
- <repository>
- <id>helios-jboss-mirror</id>
- <url>http://download.jboss.org/jbosstools/updates/helios/</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>helios</id>
- <url>http://download.eclipse.org/releases/helios/</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>webtools32</id>
- <url>http://download.eclipse.org/webtools/repository/helios</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>eclipse36</id>
- <url>http://download.eclipse.org/eclipse/updates/3.6.x/
+ <id>jboss-thirdparty</id>
+ <url>http://download.jboss.org/jbosstools/updates/requirements/thirdparty/
</url>
<layout>p2</layout>
<snapshots>
@@ -365,8 +311,8 @@
</releases>
</repository>
<repository>
- <id>birt26</id>
- <url>http://download.eclipse.org/birt/update-site/2.6/
+ <id>jboss-xulrunner-1.9.1.2</id>
+ <url>http://download.jboss.org/jbosstools/updates/requirements/xulrunner-1.9.1.2/
</url>
<layout>p2</layout>
<snapshots>
@@ -376,9 +322,9 @@
<enabled>true</enabled>
</releases>
</repository>
- <repository>
- <id>swtbot-helios</id>
- <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/
+ <!--repository>
+ <id>jboss-xulrunner-1.9.2</id>
+ <url>http://download.jboss.org/jbosstools/updates/requirements/xulrunner-1.9.2/
</url>
<layout>p2</layout>
<snapshots>
@@ -387,10 +333,10 @@
<releases>
<enabled>true</enabled>
</releases>
- </repository>
+ </repository-->
<repository>
- <id>m2eclipse</id>
- <url>http://m2eclipse.sonatype.org/sites/m2e/</url>
+ <id>google eclipse plugins</id>
+ <url>http://dl.google.com/eclipse/plugin/3.6</url>
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>
@@ -399,20 +345,18 @@
<enabled>true</enabled>
</releases>
</repository>
+ </repositories>
+ </profile>
+
+ <profile>
+ <id>helios-maintenance-no-target</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <repositories>
<repository>
- <id>m2eclipse-extras</id>
- <url>http://m2eclipse.sonatype.org/sites/m2e-extras/</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>orbit</id>
- <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/u...
+ <id>eclipse36x</id>
+ <url>http://download.eclipse.org/eclipse/updates/3.6.x/
</url>
<layout>p2</layout>
<snapshots>
@@ -422,17 +366,6 @@
<enabled>true</enabled>
</releases>
</repository>
- <repository>
- <id>google eclipse plugins</id>
- <url>http://dl.google.com/eclipse/plugin/3.6</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
</repositories>
</profile>
@@ -510,99 +443,6 @@
</repositories>
</profile>
<profile>
- <id>galileo</id>
- <repositories>
- <repository>
- <id>galileo</id>
- <url>http://download.eclipse.org/releases/galileo/</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>eclipse35</id>
- <url>http://download.eclipse.org/eclipse/updates/3.5/</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>birt25r</id>
- <url>http://download.eclipse.org/birt/update-site/2.5</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>swtbot-galileo</id>
- <url>http://download.eclipse.org/technology/swtbot/galileo/dev-build/update-site
- </url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>webtools</id>
- <url>http://download.eclipse.org/webtools/updates/</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>orbit</id>
- <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/u...
- </url>
- <layout>p2</layout>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
-
- <repository>
- <id>m2eclipse</id>
- <url>http://m2eclipse.sonatype.org/sites/m2e/</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>m2eclipse-extras</id>
- <url>http://m2eclipse.sonatype.org/sites/m2e-extras/</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
- </profile>
- <profile>
<id>coverage</id>
<activation>
<property>
15 years, 5 months
JBoss Tools SVN: r24057 - in trunk/cdi/tests/org.jboss.tools.cdi.ui.test: src/org/jboss/tools/cdi/ui/test/wizard and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2010-08-11 11:44:19 -0400 (Wed, 11 Aug 2010)
New Revision: 24057
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/NewCDIWizardTest.java
Log:
https://jira.jboss.org/browse/JBIDE-3122
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF 2010-08-11 15:43:52 UTC (rev 24056)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF 2010-08-11 15:44:19 UTC (rev 24057)
@@ -8,6 +8,7 @@
Require-Bundle: org.junit,
org.jboss.tools.tests,
org.jboss.tools.cdi.core.test,
+ org.jboss.tools.cdi.core,
org.jboss.tools.cdi.ui,
org.eclipse.core.resources,
org.jboss.tools.jst.jsp.test,
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/NewCDIWizardTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/NewCDIWizardTest.java 2010-08-11 15:43:52 UTC (rev 24056)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/NewCDIWizardTest.java 2010-08-11 15:44:19 UTC (rev 24057)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 20010 Red Hat, Inc.
+ * Copyright (c) 2007 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,
@@ -14,25 +14,32 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IPackageFragment;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.internal.ui.wizards.NewElementWizard;
+import org.eclipse.jdt.ui.wizards.NewTypeWizardPage;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.ui.PlatformUI;
+import org.jboss.tools.cdi.core.CDICorePlugin;
+import org.jboss.tools.cdi.core.ICDIAnnotation;
+import org.jboss.tools.cdi.core.ICDIProject;
import org.jboss.tools.cdi.ui.CDIUIPlugin;
-import org.jboss.tools.cdi.ui.wizard.NewCDIAnnotationCreationWizard;
-import org.jboss.tools.cdi.ui.wizard.NewCDIAnnotationWizardPage;
+//import org.jboss.tools.cdi.ui.wizard.NewCDIAnnotationWizardPage;
import org.jboss.tools.cdi.ui.wizard.NewInterceptorBindingWizardPage;
+import org.jboss.tools.cdi.ui.wizard.NewInterceptorWizardPage;
import org.jboss.tools.cdi.ui.wizard.NewQualifierWizardPage;
import org.jboss.tools.cdi.ui.wizard.NewScopeWizardPage;
import org.jboss.tools.cdi.ui.wizard.NewStereotypeWizardPage;
import org.jboss.tools.common.EclipseUtil;
import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.test.util.JUnitUtils;
+import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.WorkbenchUtils;
/**
@@ -46,13 +53,14 @@
static String STEREOTYPE_NAME = "MyStereotype";
static String SCOPE_NAME = "MyScope";
static String INTERCEPTOR_BINDING_NAME = "MyInterceptorBinding";
+ static String INTERCEPTOR_NAME = "MyInterceptor";
static class WizardContext {
- NewCDIAnnotationCreationWizard wizard;
+ NewElementWizard wizard;
IProject tck;
IJavaProject jp;
WizardDialog dialog;
- NewCDIAnnotationWizardPage page;
+ NewTypeWizardPage page;
String packName;
String typeName;
@@ -60,7 +68,7 @@
public void init(String wizardId, String packName, String typeName) {
this.packName = packName;
this.typeName = typeName;
- wizard = (NewCDIAnnotationCreationWizard)WorkbenchUtils.findWizardByDefId(wizardId);
+ wizard = (NewElementWizard)WorkbenchUtils.findWizardByDefId(wizardId);
tck = ResourcesPlugin.getWorkspace().getRoot().getProject("tck");
jp = EclipseUtil.getJavaProject(tck);
wizard.init(CDIUIPlugin.getDefault().getWorkbench(), new StructuredSelection(jp));
@@ -70,7 +78,7 @@
dialog.setBlockOnOpen(false);
dialog.open();
- page = (NewCDIAnnotationWizardPage)dialog.getSelectedPage();
+ page = (NewTypeWizardPage)dialog.getSelectedPage();
page.setTypeName(typeName, true);
IPackageFragment pack = page.getPackageFragmentRoot().getPackageFragment(PACK_NAME);
@@ -117,7 +125,7 @@
assertTrue(text.contains("@Qualifier"));
assertTrue(text.contains("@Inherited"));
- assertTrue(text.contains("@Target( { TYPE, METHOD, PARAMETER, FIELD })"));
+ assertTrue(text.contains("@Target({ TYPE, METHOD, PARAMETER, FIELD })"));
assertTrue(text.contains("@Retention(RUNTIME)"));
} finally {
@@ -143,7 +151,7 @@
assertTrue(text.contains("@Stereotype"));
assertTrue(text.contains("@Inherited"));
assertTrue(text.contains("@Named"));
- assertTrue(text.contains("@Target( { METHOD, FIELD })"));
+ assertTrue(text.contains("@Target({ METHOD, FIELD })"));
assertTrue(text.contains("@Retention(RUNTIME)"));
} finally {
@@ -166,7 +174,7 @@
assertTrue(text.contains("@NormalScope"));
assertTrue(text.contains("@Inherited"));
- assertTrue(text.contains("@Target( { TYPE, METHOD, FIELD })"));
+ assertTrue(text.contains("@Target({ TYPE, METHOD, FIELD })"));
assertTrue(text.contains("@Retention(RUNTIME)"));
} finally {
@@ -188,7 +196,7 @@
assertTrue(text.contains("@InterceptorBinding"));
assertTrue(text.contains("@Inherited"));
- assertTrue(text.contains("@Target( { TYPE, METHOD })"));
+ assertTrue(text.contains("@Target({ TYPE, METHOD })"));
assertTrue(text.contains("@Retention(RUNTIME)"));
} finally {
@@ -196,4 +204,29 @@
}
}
+ public void testNewInterceptorWizard() {
+ WizardContext context = new WizardContext();
+ context.init("org.jboss.tools.cdi.ui.wizard.NewInterceptorCreationWizard",
+ PACK_NAME, INTERCEPTOR_NAME);JobUtils.waitForIdle(2000);
+ JobUtils.waitForIdle(2000);
+ ICDIProject cdi = CDICorePlugin.getCDIProject(context.tck, true);
+ ICDIAnnotation a = cdi.getInterceptorBinding(PACK_NAME + "." + INTERCEPTOR_BINDING_NAME);
+
+ try {
+ NewInterceptorWizardPage page = (NewInterceptorWizardPage)context.page;
+
+ page.addInterceptorBinding(a);
+
+ context.wizard.performFinish();
+
+ String text = context.getNewTypeContent();
+
+ assertTrue(text.contains("@Interceptor"));
+ assertTrue(text.contains("@" + INTERCEPTOR_BINDING_NAME));
+
+ } finally {
+ context.close();
+ }
+ }
+
}
\ No newline at end of file
15 years, 5 months
JBoss Tools SVN: r24056 - trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2010-08-11 11:43:52 -0400 (Wed, 11 Aug 2010)
New Revision: 24056
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewInterceptorWizardPage.java
Log:
https://jira.jboss.org/browse/JBIDE-3122
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewInterceptorWizardPage.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewInterceptorWizardPage.java 2010-08-11 15:09:08 UTC (rev 24055)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewInterceptorWizardPage.java 2010-08-11 15:43:52 UTC (rev 24056)
@@ -90,6 +90,14 @@
super.init(selection);
}
+ public void addInterceptorBinding(ICDIAnnotation a) {
+ Object o = interceptorBindings.getValue();
+ List list = o instanceof List ? (List)o : new ArrayList();
+ if(list.contains(a)) return;
+ list.add(a);
+ interceptorBindings.setValue(new ArrayList(list));
+ }
+
public void createControl(Composite parent) {
initializeDialogUnits(parent);
15 years, 5 months