Attachment 57084 Details for Bug 161932 – Patch for DD plugin

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch for DD plugin

DD-plugin-internal-api-removal-patch.txt (text/plain), 85.62 KB, created by Saurabh Dravid

on 2007-01-18 10:31:42 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Saurabh Dravid

Created: 2007-01-18 10:31:42 EST

Size: 85.62 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.tptp.wsdm.tooling.model
>Index: src/org/apache/ws/muse/descriptor/impl/CapabilityTypeImpl.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.model/src/org/apache/ws/muse/descriptor/impl/CapabilityTypeImpl.java,v
>retrieving revision 1.8
>diff -u -r1.8 CapabilityTypeImpl.java
>--- src/org/apache/ws/muse/descriptor/impl/CapabilityTypeImpl.java	10 Nov 2006 21:19:37 -0000	1.8
>+++ src/org/apache/ws/muse/descriptor/impl/CapabilityTypeImpl.java	18 Jan 2007 15:27:15 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 IBM Corporation and others.
>+ * Copyright (c) 2007 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -9,7 +9,6 @@
> * 	Balan Subramanian (bsubram@us.ibm.com)
> * IBM Corporation - initial API and implementation
> *******************************************************************************/
>-
> package org.apache.ws.muse.descriptor.impl;
> 
> import java.util.Collection;
>@@ -49,8 +48,7 @@
> *
> * @generated
> */
>-public class CapabilityTypeImpl extends EObjectImpl implements CapabilityType
>-{
>+public class CapabilityTypeImpl extends EObjectImpl implements CapabilityType {
> 	/**
> 	 * The default value of the '{@link #getCapabilityUri() Capability Uri}' attribute.
> 	 * 
>@@ -343,4 +341,4 @@
> 		return result.toString();
> 	}
> 
>-} //CapabilityTypeImpl
>+} //CapabilityTypeImpl
>\ No newline at end of file
>Index: src/org/apache/ws/muse/descriptor/impl/ResourceTypeTypeImpl.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.model/src/org/apache/ws/muse/descriptor/impl/ResourceTypeTypeImpl.java,v
>retrieving revision 1.8
>diff -u -r1.8 ResourceTypeTypeImpl.java
>--- src/org/apache/ws/muse/descriptor/impl/ResourceTypeTypeImpl.java	10 Nov 2006 21:19:38 -0000	1.8
>+++ src/org/apache/ws/muse/descriptor/impl/ResourceTypeTypeImpl.java	18 Jan 2007 15:27:24 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 IBM Corporation and others.
>+ * Copyright (c) 2007 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -9,7 +9,6 @@
> * 	Balan Subramanian (bsubram@us.ibm.com)
> * IBM Corporation - initial API and implementation
> *******************************************************************************/
>-
> package org.apache.ws.muse.descriptor.impl;
> 
> import java.util.Collection;
>@@ -53,8 +52,7 @@
> *
> * @generated
> */
>-public class ResourceTypeTypeImpl extends EObjectImpl implements ResourceTypeType
>-{
>+public class ResourceTypeTypeImpl extends EObjectImpl implements ResourceTypeType {
> 	/**
> 	 * The default value of the '{@link #getContextPath() Context Path}' attribute.
> 	 * 
>@@ -522,4 +520,4 @@
> 		return result.toString();
> 	}
> 
>-} //ResourceTypeTypeImpl
>+} //ResourceTypeTypeImpl
>\ No newline at end of file
>Index: src/org/apache/ws/muse/descriptor/impl/WsdlTypeImpl.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.model/src/org/apache/ws/muse/descriptor/impl/WsdlTypeImpl.java,v
>retrieving revision 1.8
>diff -u -r1.8 WsdlTypeImpl.java
>--- src/org/apache/ws/muse/descriptor/impl/WsdlTypeImpl.java	10 Nov 2006 21:19:38 -0000	1.8
>+++ src/org/apache/ws/muse/descriptor/impl/WsdlTypeImpl.java	18 Jan 2007 15:27:25 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 IBM Corporation and others.
>+ * Copyright (c) 2007 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -9,7 +9,6 @@
> * 	Balan Subramanian (bsubram@us.ibm.com)
> * IBM Corporation - initial API and implementation
> *******************************************************************************/
>-
> package org.apache.ws.muse.descriptor.impl;
> 
> import org.apache.ws.muse.descriptor.DescriptorPackage;
>@@ -36,8 +35,7 @@
> *
> * @generated
> */
>-public class WsdlTypeImpl extends EObjectImpl implements WsdlType
>-{
>+public class WsdlTypeImpl extends EObjectImpl implements WsdlType {
> 	/**
> 	 * The default value of the '{@link #getWsdlFile() Wsdl File}' attribute.
> 	 * 
>@@ -66,7 +64,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected static final Object WSDL_PORT_TYPE_EDEFAULT = null;
>+	protected static final String WSDL_PORT_TYPE_EDEFAULT = null;
> 
> 	/**
> 	 * The cached value of the '{@link #getWsdlPortType() Wsdl Port Type}' attribute.
>@@ -76,7 +74,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected Object wsdlPortType = WSDL_PORT_TYPE_EDEFAULT;
>+	protected String wsdlPortType = WSDL_PORT_TYPE_EDEFAULT;
> 
> 	/**
> 	 * 
>@@ -122,7 +120,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public Object getWsdlPortType() {
>+	public String getWsdlPortType() {
> 		return wsdlPortType;
> 	}
> 
>@@ -131,8 +129,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public void setWsdlPortType(Object newWsdlPortType) {
>-		Object oldWsdlPortType = wsdlPortType;
>+	public void setWsdlPortType(String newWsdlPortType) {
>+		String oldWsdlPortType = wsdlPortType;
> 		wsdlPortType = newWsdlPortType;
> 		if (eNotificationRequired())
> 			eNotify(new ENotificationImpl(this, Notification.SET, DescriptorPackage.WSDL_TYPE__WSDL_PORT_TYPE, oldWsdlPortType, wsdlPortType));
>@@ -164,7 +162,7 @@
> 				setWsdlFile((String)newValue);
> 				return;
> 			case DescriptorPackage.WSDL_TYPE__WSDL_PORT_TYPE:
>-				setWsdlPortType((Object)newValue);
>+				setWsdlPortType((String)newValue);
> 				return;
> 		}
> 		super.eSet(featureID, newValue);
>@@ -219,4 +217,4 @@
> 		return result.toString();
> 	}
> 
>-} //WsdlTypeImpl
>+} //WsdlTypeImpl
>\ No newline at end of file
>Index: src/org/apache/ws/muse/descriptor/impl/RootTypeImpl.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.model/src/org/apache/ws/muse/descriptor/impl/RootTypeImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 RootTypeImpl.java
>--- src/org/apache/ws/muse/descriptor/impl/RootTypeImpl.java	10 Nov 2006 21:19:38 -0000	1.5
>+++ src/org/apache/ws/muse/descriptor/impl/RootTypeImpl.java	18 Jan 2007 15:27:24 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 IBM Corporation and others.
>+ * Copyright (c) 2007 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -9,7 +9,6 @@
> * 	Balan Subramanian (bsubram@us.ibm.com)
> * IBM Corporation - initial API and implementation
> *******************************************************************************/
>-
> package org.apache.ws.muse.descriptor.impl;
> 
> import java.util.Collection;
>@@ -49,8 +48,7 @@
> *
> * @generated
> */
>-public class RootTypeImpl extends EObjectImpl implements RootType
>-{
>+public class RootTypeImpl extends EObjectImpl implements RootType {
> 	/**
> 	 * The cached value of the '{@link #getMuse() Muse}' containment reference.
> 	 * 
>@@ -289,4 +287,4 @@
> 		return super.eIsSet(featureID);
> 	}
> 
>-} //RootTypeImpl
>+} //RootTypeImpl
>\ No newline at end of file
>Index: src/org/apache/ws/muse/descriptor/impl/InitialInstancesTypeImpl.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.model/src/org/apache/ws/muse/descriptor/impl/InitialInstancesTypeImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 InitialInstancesTypeImpl.java
>--- src/org/apache/ws/muse/descriptor/impl/InitialInstancesTypeImpl.java	10 Nov 2006 21:19:38 -0000	1.5
>+++ src/org/apache/ws/muse/descriptor/impl/InitialInstancesTypeImpl.java	18 Jan 2007 15:27:22 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 IBM Corporation and others.
>+ * Copyright (c) 2007 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -9,7 +9,6 @@
> * 	Balan Subramanian (bsubram@us.ibm.com)
> * IBM Corporation - initial API and implementation
> *******************************************************************************/
>-
> package org.apache.ws.muse.descriptor.impl;
> 
> import org.apache.ws.muse.descriptor.DescriptorPackage;
>@@ -40,8 +39,7 @@
> *
> * @generated
> */
>-public class InitialInstancesTypeImpl extends EObjectImpl implements InitialInstancesType
>-{
>+public class InitialInstancesTypeImpl extends EObjectImpl implements InitialInstancesType {
> 	/**
> 	 * The cached value of the '{@link #getResourceType() Resource Type}' containment reference.
> 	 * 
>@@ -245,4 +243,4 @@
> 		return super.eIsSet(featureID);
> 	}
> 
>-} //InitialInstancesTypeImpl
>+} //InitialInstancesTypeImpl
>\ No newline at end of file
>Index: src/org/apache/ws/muse/descriptor/impl/InitParamTypeImpl.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.model/src/org/apache/ws/muse/descriptor/impl/InitParamTypeImpl.java,v
>retrieving revision 1.8
>diff -u -r1.8 InitParamTypeImpl.java
>--- src/org/apache/ws/muse/descriptor/impl/InitParamTypeImpl.java	10 Nov 2006 21:19:38 -0000	1.8
>+++ src/org/apache/ws/muse/descriptor/impl/InitParamTypeImpl.java	18 Jan 2007 15:27:21 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 IBM Corporation and others.
>+ * Copyright (c) 2007 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -9,7 +9,6 @@
> * 	Balan Subramanian (bsubram@us.ibm.com)
> * IBM Corporation - initial API and implementation
> *******************************************************************************/
>-
> package org.apache.ws.muse.descriptor.impl;
> 
> import org.apache.ws.muse.descriptor.DescriptorPackage;
>@@ -36,8 +35,7 @@
> *
> * @generated
> */
>-public class InitParamTypeImpl extends EObjectImpl implements InitParamType
>-{
>+public class InitParamTypeImpl extends EObjectImpl implements InitParamType {
> 	/**
> 	 * The default value of the '{@link #getParamName() Param Name}' attribute.
> 	 * 
>@@ -219,4 +217,4 @@
> 		return result.toString();
> 	}
> 
>-} //InitParamTypeImpl
>+} //InitParamTypeImpl
>\ No newline at end of file
>Index: src/org/apache/ws/muse/descriptor/impl/DocumentRootImpl.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.model/src/org/apache/ws/muse/descriptor/impl/DocumentRootImpl.java,v
>retrieving revision 1.8
>diff -u -r1.8 DocumentRootImpl.java
>--- src/org/apache/ws/muse/descriptor/impl/DocumentRootImpl.java	10 Nov 2006 21:19:38 -0000	1.8
>+++ src/org/apache/ws/muse/descriptor/impl/DocumentRootImpl.java	18 Jan 2007 15:27:21 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 IBM Corporation and others.
>+ * Copyright (c) 2007 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -9,7 +9,6 @@
> * 	Balan Subramanian (bsubram@us.ibm.com)
> * IBM Corporation - initial API and implementation
> *******************************************************************************/
>-
> package org.apache.ws.muse.descriptor.impl;
> 
> import org.apache.ws.muse.descriptor.AdditionalJarsType;
>@@ -91,8 +90,7 @@
> *
> * @generated
> */
>-public class DocumentRootImpl extends EObjectImpl implements DocumentRoot
>-{
>+public class DocumentRootImpl extends EObjectImpl implements DocumentRoot {
> 	/**
> 	 * The cached value of the '{@link #getMixed() Mixed}' attribute list.
> 	 * 
>@@ -1439,4 +1437,4 @@
> 		return result.toString();
> 	}
> 
>-} //DocumentRootImpl
>+} //DocumentRootImpl
>\ No newline at end of file
>Index: src/org/apache/ws/muse/descriptor/impl/ReferenceParametersTypeImpl.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.model/src/org/apache/ws/muse/descriptor/impl/ReferenceParametersTypeImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 ReferenceParametersTypeImpl.java
>--- src/org/apache/ws/muse/descriptor/impl/ReferenceParametersTypeImpl.java	10 Nov 2006 21:19:38 -0000	1.5
>+++ src/org/apache/ws/muse/descriptor/impl/ReferenceParametersTypeImpl.java	18 Jan 2007 15:27:23 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 IBM Corporation and others.
>+ * Copyright (c) 2007 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -9,7 +9,6 @@
> * 	Balan Subramanian (bsubram@us.ibm.com)
> * IBM Corporation - initial API and implementation
> *******************************************************************************/
>-
> package org.apache.ws.muse.descriptor.impl;
> 
> import org.apache.ws.muse.descriptor.DescriptorPackage;
>@@ -40,8 +39,7 @@
> *
> * @generated
> */
>-public class ReferenceParametersTypeImpl extends EObjectImpl implements ReferenceParametersType
>-{
>+public class ReferenceParametersTypeImpl extends EObjectImpl implements ReferenceParametersType {
> 	/**
> 	 * The cached value of the '{@link #getAny() Any}' attribute list.
> 	 * 
>@@ -202,4 +200,4 @@
> 		return result.toString();
> 	}
> 
>-} //ReferenceParametersTypeImpl
>+} //ReferenceParametersTypeImpl
>\ No newline at end of file
>Index: src/org/apache/ws/muse/descriptor/impl/LoggingTypeImpl.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.model/src/org/apache/ws/muse/descriptor/impl/LoggingTypeImpl.java,v
>retrieving revision 1.8
>diff -u -r1.8 LoggingTypeImpl.java
>--- src/org/apache/ws/muse/descriptor/impl/LoggingTypeImpl.java	10 Nov 2006 21:19:38 -0000	1.8
>+++ src/org/apache/ws/muse/descriptor/impl/LoggingTypeImpl.java	18 Jan 2007 15:27:22 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 IBM Corporation and others.
>+ * Copyright (c) 2007 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -9,7 +9,6 @@
> * 	Balan Subramanian (bsubram@us.ibm.com)
> * IBM Corporation - initial API and implementation
> *******************************************************************************/
>-
> package org.apache.ws.muse.descriptor.impl;
> 
> import org.apache.ws.muse.descriptor.DescriptorPackage;
>@@ -37,8 +36,7 @@
> *
> * @generated
> */
>-public class LoggingTypeImpl extends EObjectImpl implements LoggingType
>-{
>+public class LoggingTypeImpl extends EObjectImpl implements LoggingType {
> 	/**
> 	 * The default value of the '{@link #getLogFile() Log File}' attribute.
> 	 * 
>@@ -254,4 +252,4 @@
> 		return result.toString();
> 	}
> 
>-} //LoggingTypeImpl
>+} //LoggingTypeImpl
>\ No newline at end of file
>Index: src/org/apache/ws/muse/descriptor/impl/MuseTypeImpl.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.model/src/org/apache/ws/muse/descriptor/impl/MuseTypeImpl.java,v
>retrieving revision 1.8
>diff -u -r1.8 MuseTypeImpl.java
>--- src/org/apache/ws/muse/descriptor/impl/MuseTypeImpl.java	10 Nov 2006 21:19:38 -0000	1.8
>+++ src/org/apache/ws/muse/descriptor/impl/MuseTypeImpl.java	18 Jan 2007 15:27:23 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 IBM Corporation and others.
>+ * Copyright (c) 2007 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -9,7 +9,6 @@
> * 	Balan Subramanian (bsubram@us.ibm.com)
> * IBM Corporation - initial API and implementation
> *******************************************************************************/
>-
> package org.apache.ws.muse.descriptor.impl;
> 
> import java.util.Collection;
>@@ -49,8 +48,7 @@
> *
> * @generated
> */
>-public class MuseTypeImpl extends EObjectImpl implements MuseType
>-{
>+public class MuseTypeImpl extends EObjectImpl implements MuseType {
> 	/**
> 	 * The cached value of the '{@link #getRouter() Router}' containment reference.
> 	 * 
>@@ -259,4 +257,4 @@
> 		return super.eIsSet(featureID);
> 	}
> 
>-} //MuseTypeImpl
>+} //MuseTypeImpl
>\ No newline at end of file
>Index: src/org/apache/ws/muse/descriptor/impl/DescriptorPackageImpl.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.model/src/org/apache/ws/muse/descriptor/impl/DescriptorPackageImpl.java,v
>retrieving revision 1.8
>diff -u -r1.8 DescriptorPackageImpl.java
>--- src/org/apache/ws/muse/descriptor/impl/DescriptorPackageImpl.java	10 Nov 2006 21:19:38 -0000	1.8
>+++ src/org/apache/ws/muse/descriptor/impl/DescriptorPackageImpl.java	18 Jan 2007 15:27:19 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 IBM Corporation and others.
>+ * Copyright (c) 2007 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -9,7 +9,6 @@
> * 	Balan Subramanian (bsubram@us.ibm.com)
> * IBM Corporation - initial API and implementation
> *******************************************************************************/
>-
> package org.apache.ws.muse.descriptor.impl;
> 
> import org.apache.ws.muse.descriptor.AdditionalJarsType;
>@@ -47,8 +46,7 @@
> * 
> * @generated
> */
>-public class DescriptorPackageImpl extends EPackageImpl implements DescriptorPackage
>-{
>+public class DescriptorPackageImpl extends EPackageImpl implements DescriptorPackage {
> 	/**
> 	 * 
> 	 * 
>@@ -1253,7 +1251,7 @@
> 
> 		initEClass(wsdlTypeEClass, WsdlType.class, "WsdlType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
> 		initEAttribute(getWsdlType_WsdlFile(), theXMLTypePackage.getAnyURI(), "wsdlFile", null, 1, 1, WsdlType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
>-		initEAttribute(getWsdlType_WsdlPortType(), theXMLTypePackage.getQName(), "wsdlPortType", null, 1, 1, WsdlType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
>+		initEAttribute(getWsdlType_WsdlPortType(), theXMLTypePackage.getString(), "wsdlPortType", null, 1, 1, WsdlType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
> 
> 		// Initialize enums and add enum literals
> 		initEEnum(logLevelTypeEEnum, LogLevelType.class, "LogLevelType");
>Index: src/org/apache/ws/muse/descriptor/impl/PersistenceTypeImpl.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.model/src/org/apache/ws/muse/descriptor/impl/PersistenceTypeImpl.java,v
>retrieving revision 1.8
>diff -u -r1.8 PersistenceTypeImpl.java
>--- src/org/apache/ws/muse/descriptor/impl/PersistenceTypeImpl.java	10 Nov 2006 21:19:38 -0000	1.8
>+++ src/org/apache/ws/muse/descriptor/impl/PersistenceTypeImpl.java	18 Jan 2007 15:27:23 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 IBM Corporation and others.
>+ * Copyright (c) 2007 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -9,7 +9,6 @@
> * 	Balan Subramanian (bsubram@us.ibm.com)
> * IBM Corporation - initial API and implementation
> *******************************************************************************/
>-
> package org.apache.ws.muse.descriptor.impl;
> 
> import java.util.Collection;
>@@ -47,8 +46,7 @@
> *
> * @generated
> */
>-public class PersistenceTypeImpl extends EObjectImpl implements PersistenceType
>-{
>+public class PersistenceTypeImpl extends EObjectImpl implements PersistenceType {
> 	/**
> 	 * The default value of the '{@link #getJavaPersistenceClass() Java Persistence Class}' attribute.
> 	 * 
>@@ -276,4 +274,4 @@
> 		return result.toString();
> 	}
> 
>-} //PersistenceTypeImpl
>+} //PersistenceTypeImpl
>\ No newline at end of file
>Index: src/org/apache/ws/muse/descriptor/impl/AdditionalJarsTypeImpl.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.model/src/org/apache/ws/muse/descriptor/impl/AdditionalJarsTypeImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 AdditionalJarsTypeImpl.java
>--- src/org/apache/ws/muse/descriptor/impl/AdditionalJarsTypeImpl.java	10 Nov 2006 21:19:38 -0000	1.5
>+++ src/org/apache/ws/muse/descriptor/impl/AdditionalJarsTypeImpl.java	18 Jan 2007 15:27:15 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 IBM Corporation and others.
>+ * Copyright (c) 2007 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -9,7 +9,6 @@
> * 	Balan Subramanian (bsubram@us.ibm.com)
> * IBM Corporation - initial API and implementation
> *******************************************************************************/
>-
> package org.apache.ws.muse.descriptor.impl;
> 
> import java.util.Collection;
>@@ -38,8 +37,7 @@
> *
> * @generated
> */
>-public class AdditionalJarsTypeImpl extends EObjectImpl implements AdditionalJarsType
>-{
>+public class AdditionalJarsTypeImpl extends EObjectImpl implements AdditionalJarsType {
> 	/**
> 	 * The cached value of the '{@link #getJarPath() Jar Path}' attribute list.
> 	 * 
>@@ -150,4 +148,4 @@
> 		return result.toString();
> 	}
> 
>-} //AdditionalJarsTypeImpl
>+} //AdditionalJarsTypeImpl
>\ No newline at end of file
>Index: src/org/apache/ws/muse/descriptor/impl/CustomSerializerTypeImpl.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.model/src/org/apache/ws/muse/descriptor/impl/CustomSerializerTypeImpl.java,v
>retrieving revision 1.8
>diff -u -r1.8 CustomSerializerTypeImpl.java
>--- src/org/apache/ws/muse/descriptor/impl/CustomSerializerTypeImpl.java	10 Nov 2006 21:19:38 -0000	1.8
>+++ src/org/apache/ws/muse/descriptor/impl/CustomSerializerTypeImpl.java	18 Jan 2007 15:27:16 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 IBM Corporation and others.
>+ * Copyright (c) 2007 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -9,7 +9,6 @@
> * 	Balan Subramanian (bsubram@us.ibm.com)
> * IBM Corporation - initial API and implementation
> *******************************************************************************/
>-
> package org.apache.ws.muse.descriptor.impl;
> 
> import org.apache.ws.muse.descriptor.CustomSerializerType;
>@@ -36,8 +35,7 @@
> *
> * @generated
> */
>-public class CustomSerializerTypeImpl extends EObjectImpl implements CustomSerializerType
>-{
>+public class CustomSerializerTypeImpl extends EObjectImpl implements CustomSerializerType {
> 	/**
> 	 * The default value of the '{@link #getJavaSerializableType() Java Serializable Type}' attribute.
> 	 * 
>@@ -219,4 +217,4 @@
> 		return result.toString();
> 	}
> 
>-} //CustomSerializerTypeImpl
>+} //CustomSerializerTypeImpl
>\ No newline at end of file
>Index: src/org/apache/ws/muse/descriptor/impl/RouterTypeImpl.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.model/src/org/apache/ws/muse/descriptor/impl/RouterTypeImpl.java,v
>retrieving revision 1.8
>diff -u -r1.8 RouterTypeImpl.java
>--- src/org/apache/ws/muse/descriptor/impl/RouterTypeImpl.java	10 Nov 2006 21:19:38 -0000	1.8
>+++ src/org/apache/ws/muse/descriptor/impl/RouterTypeImpl.java	18 Jan 2007 15:27:25 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 IBM Corporation and others.
>+ * Copyright (c) 2007 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -9,7 +9,6 @@
> * 	Balan Subramanian (bsubram@us.ibm.com)
> * IBM Corporation - initial API and implementation
> *******************************************************************************/
>-
> package org.apache.ws.muse.descriptor.impl;
> 
> import org.apache.ws.muse.descriptor.DescriptorPackage;
>@@ -41,8 +40,7 @@
> *
> * @generated
> */
>-public class RouterTypeImpl extends EObjectImpl implements RouterType
>-{
>+public class RouterTypeImpl extends EObjectImpl implements RouterType {
> 	/**
> 	 * The default value of the '{@link #getJavaRouterClass() Java Router Class}' attribute.
> 	 * 
>@@ -312,4 +310,4 @@
> 		return result.toString();
> 	}
> 
>-} //RouterTypeImpl
>+} //RouterTypeImpl
>\ No newline at end of file
>Index: src/org/apache/ws/muse/descriptor/impl/DescriptorFactoryImpl.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.model/src/org/apache/ws/muse/descriptor/impl/DescriptorFactoryImpl.java,v
>retrieving revision 1.8
>diff -u -r1.8 DescriptorFactoryImpl.java
>--- src/org/apache/ws/muse/descriptor/impl/DescriptorFactoryImpl.java	10 Nov 2006 21:19:38 -0000	1.8
>+++ src/org/apache/ws/muse/descriptor/impl/DescriptorFactoryImpl.java	18 Jan 2007 15:27:16 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 IBM Corporation and others.
>+ * Copyright (c) 2007 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -9,7 +9,6 @@
> * 	Balan Subramanian (bsubram@us.ibm.com)
> * IBM Corporation - initial API and implementation
> *******************************************************************************/
>-
> package org.apache.ws.muse.descriptor.impl;
> 
> import org.apache.ws.muse.descriptor.*;
>@@ -29,8 +28,7 @@
> * 
> * @generated
> */
>-public class DescriptorFactoryImpl extends EFactoryImpl implements DescriptorFactory
>-{
>+public class DescriptorFactoryImpl extends EFactoryImpl implements DescriptorFactory {
> 	/**
> 	 * Creates the default factory implementation.
> 	 * 
>Index: src/org/apache/ws/muse/descriptor/CustomSerializerType.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.model/src/org/apache/ws/muse/descriptor/CustomSerializerType.java,v
>retrieving revision 1.7
>diff -u -r1.7 CustomSerializerType.java
>--- src/org/apache/ws/muse/descriptor/CustomSerializerType.java	13 Sep 2006 12:05:54 -0000	1.7
>+++ src/org/apache/ws/muse/descriptor/CustomSerializerType.java	18 Jan 2007 15:27:06 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 IBM Corporation and others.
>+ * Copyright (c) 2007 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -9,7 +9,6 @@
> * 	Balan Subramanian (bsubram@us.ibm.com)
> * IBM Corporation - initial API and implementation
> *******************************************************************************/
>- 
> package org.apache.ws.muse.descriptor;
> 
> import org.eclipse.emf.ecore.EObject;
>@@ -31,8 +30,7 @@
> * @model extendedMetaData="name='custom-serializer_._type' kind='elementOnly'"
> * @generated
> */
>-public interface CustomSerializerType extends EObject
>-{
>+public interface CustomSerializerType extends EObject {
> 	/**
> 	 * Returns the value of the 'Java Serializable Type' attribute.
> 	 * 
>@@ -87,4 +85,4 @@
> 	 */
> 	void setJavaSerializerClass(String value);
> 
>-} // CustomSerializerType
>+} // CustomSerializerType
>\ No newline at end of file
>Index: src/org/apache/ws/muse/descriptor/DescriptorPackage.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.model/src/org/apache/ws/muse/descriptor/DescriptorPackage.java,v
>retrieving revision 1.8
>diff -u -r1.8 DescriptorPackage.java
>--- src/org/apache/ws/muse/descriptor/DescriptorPackage.java	10 Nov 2006 21:19:38 -0000	1.8
>+++ src/org/apache/ws/muse/descriptor/DescriptorPackage.java	18 Jan 2007 15:27:10 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 IBM Corporation and others.
>+ * Copyright (c) 2007 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -9,7 +9,6 @@
> * 	Balan Subramanian (bsubram@us.ibm.com)
> * IBM Corporation - initial API and implementation
> *******************************************************************************/
>-
> package org.apache.ws.muse.descriptor;
> 
> import org.eclipse.emf.ecore.EAttribute;
>@@ -1917,7 +1916,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	interface Literals {
>+	interface Literals {
> 		/**
> 		 * The meta object literal for the '{@link org.apache.ws.muse.descriptor.impl.AdditionalJarsTypeImpl Additional Jars Type}' class.
> 		 * 
>Index: src/org/apache/ws/muse/descriptor/MuseType.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.model/src/org/apache/ws/muse/descriptor/MuseType.java,v
>retrieving revision 1.7
>diff -u -r1.7 MuseType.java
>--- src/org/apache/ws/muse/descriptor/MuseType.java	13 Sep 2006 12:05:54 -0000	1.7
>+++ src/org/apache/ws/muse/descriptor/MuseType.java	18 Jan 2007 15:27:13 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 IBM Corporation and others.
>+ * Copyright (c) 2007 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -9,7 +9,6 @@
> * 	Balan Subramanian (bsubram@us.ibm.com)
> * IBM Corporation - initial API and implementation
> *******************************************************************************/
>-
> package org.apache.ws.muse.descriptor;
> 
> import org.eclipse.emf.common.util.EList;
>@@ -34,8 +33,7 @@
> * @model extendedMetaData="name='muse_._type' kind='elementOnly'"
> * @generated
> */
>-public interface MuseType extends EObject
>-{
>+public interface MuseType extends EObject {
> 	/**
> 	 * Returns the value of the 'Router' containment reference.
> 	 * 
>@@ -97,4 +95,4 @@
> 	 */
> 	EList getCustomSerializer();
> 
>-} // MuseType
>+} // MuseType
>\ No newline at end of file
>Index: src/org/apache/ws/muse/descriptor/RootType.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.model/src/org/apache/ws/muse/descriptor/RootType.java,v
>retrieving revision 1.4
>diff -u -r1.4 RootType.java
>--- src/org/apache/ws/muse/descriptor/RootType.java	13 Sep 2006 12:05:54 -0000	1.4
>+++ src/org/apache/ws/muse/descriptor/RootType.java	18 Jan 2007 15:27:14 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 IBM Corporation and others.
>+ * Copyright (c) 2007 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -9,7 +9,6 @@
> * 	Balan Subramanian (bsubram@us.ibm.com)
> * IBM Corporation - initial API and implementation
> *******************************************************************************/
>-
> package org.apache.ws.muse.descriptor;
> 
> import org.eclipse.emf.common.util.EList;
>@@ -34,8 +33,7 @@
> * @model extendedMetaData="name='Root_._type' kind='elementOnly'"
> * @generated
> */
>-public interface RootType extends EObject
>-{
>+public interface RootType extends EObject {
> 	/**
> 	 * Returns the value of the 'Muse' containment reference.
> 	 * 
>@@ -107,4 +105,4 @@
> 	 */
> 	void setAdditionalJars(AdditionalJarsType value);
> 
>-} // RootType
>+} // RootType
>\ No newline at end of file
>Index: src/org/apache/ws/muse/descriptor/LoggingType.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.model/src/org/apache/ws/muse/descriptor/LoggingType.java,v
>retrieving revision 1.7
>diff -u -r1.7 LoggingType.java
>--- src/org/apache/ws/muse/descriptor/LoggingType.java	13 Sep 2006 12:05:54 -0000	1.7
>+++ src/org/apache/ws/muse/descriptor/LoggingType.java	18 Jan 2007 15:27:13 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 IBM Corporation and others.
>+ * Copyright (c) 2007 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -9,7 +9,6 @@
> * 	Balan Subramanian (bsubram@us.ibm.com)
> * IBM Corporation - initial API and implementation
> *******************************************************************************/
>-
> package org.apache.ws.muse.descriptor;
> 
> import org.eclipse.emf.ecore.EObject;
>@@ -31,8 +30,7 @@
> * @model extendedMetaData="name='logging_._type' kind='elementOnly'"
> * @generated
> */
>-public interface LoggingType extends EObject
>-{
>+public interface LoggingType extends EObject {
> 	/**
> 	 * Returns the value of the 'Log File' attribute.
> 	 * 
>@@ -118,4 +116,4 @@
> 	 */
> 	boolean isSetLogLevel();
> 
>-} // LoggingType
>+} // LoggingType
>\ No newline at end of file
>Index: src/org/apache/ws/muse/descriptor/CapabilityType.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.model/src/org/apache/ws/muse/descriptor/CapabilityType.java,v
>retrieving revision 1.7
>diff -u -r1.7 CapabilityType.java
>--- src/org/apache/ws/muse/descriptor/CapabilityType.java	13 Sep 2006 12:05:54 -0000	1.7
>+++ src/org/apache/ws/muse/descriptor/CapabilityType.java	18 Jan 2007 15:27:06 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 IBM Corporation and others.
>+ * Copyright (c) 2007 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -9,7 +9,6 @@
> * 	Balan Subramanian (bsubram@us.ibm.com)
> * IBM Corporation - initial API and implementation
> *******************************************************************************/
>- 
> package org.apache.ws.muse.descriptor;
> 
> import org.eclipse.emf.common.util.EList;
>@@ -35,8 +34,7 @@
> * @model extendedMetaData="name='capability_._type' kind='elementOnly'"
> * @generated
> */
>-public interface CapabilityType extends EObject
>-{
>+public interface CapabilityType extends EObject {
> 	/**
> 	 * Returns the value of the 'Capability Uri' attribute.
> 	 * 
>@@ -135,4 +133,4 @@
> 	 */
> 	EList getInitParam();
> 
>-} // CapabilityType
>+} // CapabilityType
>\ No newline at end of file
>Index: src/org/apache/ws/muse/descriptor/RouterType.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.model/src/org/apache/ws/muse/descriptor/RouterType.java,v
>retrieving revision 1.7
>diff -u -r1.7 RouterType.java
>--- src/org/apache/ws/muse/descriptor/RouterType.java	13 Sep 2006 12:05:54 -0000	1.7
>+++ src/org/apache/ws/muse/descriptor/RouterType.java	18 Jan 2007 15:27:14 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 IBM Corporation and others.
>+ * Copyright (c) 2007 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -9,7 +9,6 @@
> * 	Balan Subramanian (bsubram@us.ibm.com)
> * IBM Corporation - initial API and implementation
> *******************************************************************************/
>-
> package org.apache.ws.muse.descriptor;
> 
> import org.eclipse.emf.ecore.EObject;
>@@ -32,8 +31,7 @@
> * @model extendedMetaData="name='router_._type' kind='elementOnly'"
> * @generated
> */
>-public interface RouterType extends EObject
>-{
>+public interface RouterType extends EObject {
> 	/**
> 	 * Returns the value of the 'Java Router Class' attribute.
> 	 * 
>@@ -115,4 +113,4 @@
> 	 */
> 	void setPersistence(PersistenceType value);
> 
>-} // RouterType
>+} // RouterType
>\ No newline at end of file
>Index: src/org/apache/ws/muse/descriptor/WsdlType.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.model/src/org/apache/ws/muse/descriptor/WsdlType.java,v
>retrieving revision 1.7
>diff -u -r1.7 WsdlType.java
>--- src/org/apache/ws/muse/descriptor/WsdlType.java	13 Sep 2006 12:05:54 -0000	1.7
>+++ src/org/apache/ws/muse/descriptor/WsdlType.java	18 Jan 2007 15:27:15 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 IBM Corporation and others.
>+ * Copyright (c) 2007 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -9,7 +9,6 @@
> * 	Balan Subramanian (bsubram@us.ibm.com)
> * IBM Corporation - initial API and implementation
> *******************************************************************************/
>-
> package org.apache.ws.muse.descriptor;
> 
> import org.eclipse.emf.ecore.EObject;
>@@ -31,8 +30,7 @@
> * @model extendedMetaData="name='wsdl_._type' kind='elementOnly'"
> * @generated
> */
>-public interface WsdlType extends EObject
>-{
>+public interface WsdlType extends EObject {
> 	/**
> 	 * Returns the value of the 'Wsdl File' attribute.
> 	 * 
>@@ -69,13 +67,13 @@
> 	 * 
> 	 * 
> 	 * @return the value of the 'Wsdl Port Type' attribute.
>-	 * @see #setWsdlPortType(Object)
>+	 * @see #setWsdlPortType(String)
> 	 * @see org.apache.ws.muse.descriptor.DescriptorPackage#getWsdlType_WsdlPortType()
>-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.QName" required="true"
>+	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
> 	 * extendedMetaData="kind='element' name='wsdl-port-type' namespace='##targetNamespace'"
> 	 * @generated
> 	 */
>-	Object getWsdlPortType();
>+	String getWsdlPortType();
> 
> 	/**
> 	 * Sets the value of the '{@link org.apache.ws.muse.descriptor.WsdlType#getWsdlPortType Wsdl Port Type}' attribute.
>@@ -85,6 +83,6 @@
> 	 * @see #getWsdlPortType()
> 	 * @generated
> 	 */
>-	void setWsdlPortType(Object value);
>+	void setWsdlPortType(String value);
> 
>-} // WsdlType
>+} // WsdlType
>\ No newline at end of file
>Index: src/org/apache/ws/muse/descriptor/ResourceTypeType.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.model/src/org/apache/ws/muse/descriptor/ResourceTypeType.java,v
>retrieving revision 1.8
>diff -u -r1.8 ResourceTypeType.java
>--- src/org/apache/ws/muse/descriptor/ResourceTypeType.java	10 Nov 2006 21:19:38 -0000	1.8
>+++ src/org/apache/ws/muse/descriptor/ResourceTypeType.java	18 Jan 2007 15:27:14 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 IBM Corporation and others.
>+ * Copyright (c) 2007 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -9,7 +9,6 @@
> * 	Balan Subramanian (bsubram@us.ibm.com)
> * IBM Corporation - initial API and implementation
> *******************************************************************************/
>-
> package org.apache.ws.muse.descriptor;
> 
> import org.eclipse.emf.common.util.EList;
>@@ -236,4 +235,4 @@
> 	 */
> 	boolean isSetUseRouterPersistence();
> 
>-} // ResourceTypeType
>+} // ResourceTypeType
>\ No newline at end of file
>Index: src/org/apache/ws/muse/descriptor/DescriptorFactory.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.model/src/org/apache/ws/muse/descriptor/DescriptorFactory.java,v
>retrieving revision 1.7
>diff -u -r1.7 DescriptorFactory.java
>--- src/org/apache/ws/muse/descriptor/DescriptorFactory.java	13 Sep 2006 12:05:54 -0000	1.7
>+++ src/org/apache/ws/muse/descriptor/DescriptorFactory.java	18 Jan 2007 15:27:06 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 IBM Corporation and others.
>+ * Copyright (c) 2007 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -9,7 +9,6 @@
> * 	Balan Subramanian (bsubram@us.ibm.com)
> * IBM Corporation - initial API and implementation
> *******************************************************************************/
>-
> package org.apache.ws.muse.descriptor;
> 
> import org.eclipse.emf.ecore.EFactory;
>@@ -22,8 +21,7 @@
> * @see org.apache.ws.muse.descriptor.DescriptorPackage
> * @generated
> */
>-public interface DescriptorFactory extends EFactory
>-{
>+public interface DescriptorFactory extends EFactory {
> 	/**
> 	 * The singleton instance of the factory.
> 	 * 
>Index: src/org/apache/ws/muse/descriptor/ReferenceParametersType.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.model/src/org/apache/ws/muse/descriptor/ReferenceParametersType.java,v
>retrieving revision 1.4
>diff -u -r1.4 ReferenceParametersType.java
>--- src/org/apache/ws/muse/descriptor/ReferenceParametersType.java	13 Sep 2006 12:05:54 -0000	1.4
>+++ src/org/apache/ws/muse/descriptor/ReferenceParametersType.java	18 Jan 2007 15:27:14 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 IBM Corporation and others.
>+ * Copyright (c) 2007 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -9,7 +9,6 @@
> * 	Balan Subramanian (bsubram@us.ibm.com)
> * IBM Corporation - initial API and implementation
> *******************************************************************************/
>-
> package org.apache.ws.muse.descriptor;
> 
> import org.eclipse.emf.ecore.EObject;
>@@ -33,8 +32,7 @@
> * @model extendedMetaData="name='ReferenceParametersType' kind='elementOnly'"
> * @generated
> */
>-public interface ReferenceParametersType extends EObject
>-{
>+public interface ReferenceParametersType extends EObject {
> 	/**
> 	 * Returns the value of the 'Any' attribute list.
> 	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
>@@ -69,4 +67,4 @@
> 	 */
> 	FeatureMap getAnyAttribute();
> 
>-} // ReferenceParametersType
>+} // ReferenceParametersType
>\ No newline at end of file
>Index: src/org/apache/ws/muse/descriptor/PersistenceType.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.model/src/org/apache/ws/muse/descriptor/PersistenceType.java,v
>retrieving revision 1.7
>diff -u -r1.7 PersistenceType.java
>--- src/org/apache/ws/muse/descriptor/PersistenceType.java	13 Sep 2006 12:05:54 -0000	1.7
>+++ src/org/apache/ws/muse/descriptor/PersistenceType.java	18 Jan 2007 15:27:13 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 IBM Corporation and others.
>+ * Copyright (c) 2007 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -9,7 +9,6 @@
> * 	Balan Subramanian (bsubram@us.ibm.com)
> * IBM Corporation - initial API and implementation
> *******************************************************************************/
>-
> package org.apache.ws.muse.descriptor;
> 
> import org.eclipse.emf.common.util.EList;
>@@ -34,8 +33,7 @@
> * @model extendedMetaData="name='persistence_._type' kind='elementOnly'"
> * @generated
> */
>-public interface PersistenceType extends EObject
>-{
>+public interface PersistenceType extends EObject {
> 	/**
> 	 * Returns the value of the 'Java Persistence Class' attribute.
> 	 * 
>@@ -107,4 +105,4 @@
> 	 */
> 	EList getInitParam();
> 
>-} // PersistenceType
>+} // PersistenceType
>\ No newline at end of file
>Index: src/org/apache/ws/muse/descriptor/InitParamType.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.model/src/org/apache/ws/muse/descriptor/InitParamType.java,v
>retrieving revision 1.7
>diff -u -r1.7 InitParamType.java
>--- src/org/apache/ws/muse/descriptor/InitParamType.java	13 Sep 2006 12:05:54 -0000	1.7
>+++ src/org/apache/ws/muse/descriptor/InitParamType.java	18 Jan 2007 15:27:12 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 IBM Corporation and others.
>+ * Copyright (c) 2007 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -9,7 +9,6 @@
> * 	Balan Subramanian (bsubram@us.ibm.com)
> * IBM Corporation - initial API and implementation
> *******************************************************************************/
>-
> package org.apache.ws.muse.descriptor;
> 
> import org.eclipse.emf.ecore.EObject;
>@@ -31,8 +30,7 @@
> * @model extendedMetaData="name='init-param_._type' kind='elementOnly'"
> * @generated
> */
>-public interface InitParamType extends EObject
>-{
>+public interface InitParamType extends EObject {
> 	/**
> 	 * Returns the value of the 'Param Name' attribute.
> 	 * 
>@@ -87,4 +85,4 @@
> 	 */
> 	void setParamValue(String value);
> 
>-} // InitParamType
>+} // InitParamType
>\ No newline at end of file
>Index: src/org/apache/ws/muse/descriptor/DocumentRoot.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.model/src/org/apache/ws/muse/descriptor/DocumentRoot.java,v
>retrieving revision 1.7
>diff -u -r1.7 DocumentRoot.java
>--- src/org/apache/ws/muse/descriptor/DocumentRoot.java	13 Sep 2006 12:05:54 -0000	1.7
>+++ src/org/apache/ws/muse/descriptor/DocumentRoot.java	18 Jan 2007 15:27:12 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 IBM Corporation and others.
>+ * Copyright (c) 2007 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -9,7 +9,6 @@
> * 	Balan Subramanian (bsubram@us.ibm.com)
> * IBM Corporation - initial API and implementation
> *******************************************************************************/
>-
> package org.apache.ws.muse.descriptor;
> 
> import org.eclipse.emf.common.util.EMap;
>@@ -66,8 +65,7 @@
> * @model extendedMetaData="name='' kind='mixed'"
> * @generated
> */
>-public interface DocumentRoot extends EObject
>-{
>+public interface DocumentRoot extends EObject {
> 	/**
> 	 * Returns the value of the 'Mixed' attribute list.
> 	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
>@@ -935,4 +933,4 @@
> 	 */
> 	void setWsdlPortType(Object value);
> 
>-} // DocumentRoot
>+} // DocumentRoot
>\ No newline at end of file
>Index: src/org/apache/ws/muse/descriptor/InitialInstancesType.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.model/src/org/apache/ws/muse/descriptor/InitialInstancesType.java,v
>retrieving revision 1.4
>diff -u -r1.4 InitialInstancesType.java
>--- src/org/apache/ws/muse/descriptor/InitialInstancesType.java	13 Sep 2006 12:05:54 -0000	1.4
>+++ src/org/apache/ws/muse/descriptor/InitialInstancesType.java	18 Jan 2007 15:27:12 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 IBM Corporation and others.
>+ * Copyright (c) 2007 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -9,7 +9,6 @@
> * 	Balan Subramanian (bsubram@us.ibm.com)
> * IBM Corporation - initial API and implementation
> *******************************************************************************/
>-
> package org.apache.ws.muse.descriptor;
> 
> import org.eclipse.emf.ecore.EObject;
>@@ -31,8 +30,7 @@
> * @model extendedMetaData="name='initial-instances_._type' kind='elementOnly'"
> * @generated
> */
>-public interface InitialInstancesType extends EObject
>-{
>+public interface InitialInstancesType extends EObject {
> 	/**
> 	 * Returns the value of the 'Resource Type' containment reference.
> 	 * 
>@@ -64,7 +62,7 @@
> 	 * Returns the value of the 'Reference Parameters' containment reference.
> 	 * 
> 	 * 
>-	 * If the meaning of the 'Reference Parameters' reference isn't clear,
>+	 * If the meaning of the 'Reference Parameters' containment reference isn't clear,
> 	 * there really should be more of a description here...
> 	 * 
> 	 * 
>@@ -87,4 +85,4 @@
> 	 */
> 	void setReferenceParameters(ReferenceParametersType value);
> 
>-} // InitialInstancesType
>+} // InitialInstancesType
>\ No newline at end of file
>Index: src/org/apache/ws/muse/descriptor/AdditionalJarsType.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.model/src/org/apache/ws/muse/descriptor/AdditionalJarsType.java,v
>retrieving revision 1.4
>diff -u -r1.4 AdditionalJarsType.java
>--- src/org/apache/ws/muse/descriptor/AdditionalJarsType.java	13 Sep 2006 12:05:53 -0000	1.4
>+++ src/org/apache/ws/muse/descriptor/AdditionalJarsType.java	18 Jan 2007 15:27:06 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 IBM Corporation and others.
>+ * Copyright (c) 2007 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -9,7 +9,6 @@
> * 	Balan Subramanian (bsubram@us.ibm.com)
> * IBM Corporation - initial API and implementation
> *******************************************************************************/
>- 
> package org.apache.ws.muse.descriptor;
> 
> import org.eclipse.emf.common.util.EList;
>@@ -32,8 +31,7 @@
> * @model extendedMetaData="name='additional-jars_._type' kind='elementOnly'"
> * @generated
> */
>-public interface AdditionalJarsType extends EObject
>-{
>+public interface AdditionalJarsType extends EObject {
> 	/**
> 	 * Returns the value of the 'Jar Path' attribute list.
> 	 * The list contents are of type {@link java.lang.String}.
>@@ -51,4 +49,4 @@
> 	 */
> 	EList getJarPath();
> 
>-} // AdditionalJarsType
>+} // AdditionalJarsType
>\ No newline at end of file
>Index: src/org/apache/ws/muse/descriptor/LogLevelType.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.model/src/org/apache/ws/muse/descriptor/LogLevelType.java,v
>retrieving revision 1.8
>diff -u -r1.8 LogLevelType.java
>--- src/org/apache/ws/muse/descriptor/LogLevelType.java	10 Nov 2006 21:19:38 -0000	1.8
>+++ src/org/apache/ws/muse/descriptor/LogLevelType.java	18 Jan 2007 15:27:13 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 IBM Corporation and others.
>+ * Copyright (c) 2007 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -9,7 +9,6 @@
> * 	Balan Subramanian (bsubram@us.ibm.com)
> * IBM Corporation - initial API and implementation
> *******************************************************************************/
>-
> package org.apache.ws.muse.descriptor;
> 
> import java.util.Arrays;
>@@ -27,8 +26,7 @@
> * @model
> * @generated
> */
>-public final class LogLevelType extends AbstractEnumerator
>-{
>+public final class LogLevelType extends AbstractEnumerator {
> 	/**
> 	 * The 'OFF' literal value.
> 	 * 
>Index: src/org/apache/ws/muse/descriptor/util/DescriptorResourceFactoryImpl.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.model/src/org/apache/ws/muse/descriptor/util/DescriptorResourceFactoryImpl.java,v
>retrieving revision 1.7
>diff -u -r1.7 DescriptorResourceFactoryImpl.java
>--- src/org/apache/ws/muse/descriptor/util/DescriptorResourceFactoryImpl.java	13 Sep 2006 12:05:56 -0000	1.7
>+++ src/org/apache/ws/muse/descriptor/util/DescriptorResourceFactoryImpl.java	18 Jan 2007 15:27:26 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 IBM Corporation and others.
>+ * Copyright (c) 2007 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>Index: src/org/apache/ws/muse/descriptor/util/DescriptorResourceImpl.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.model/src/org/apache/ws/muse/descriptor/util/DescriptorResourceImpl.java,v
>retrieving revision 1.8
>diff -u -r1.8 DescriptorResourceImpl.java
>--- src/org/apache/ws/muse/descriptor/util/DescriptorResourceImpl.java	10 Nov 2006 21:19:38 -0000	1.8
>+++ src/org/apache/ws/muse/descriptor/util/DescriptorResourceImpl.java	18 Jan 2007 15:27:26 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 IBM Corporation and others.
>+ * Copyright (c) 2007 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -9,7 +9,6 @@
> * 	Balan Subramanian (bsubram@us.ibm.com)
> * IBM Corporation - initial API and implementation
> *******************************************************************************/
>-
> package org.apache.ws.muse.descriptor.util;
> 
> import org.eclipse.emf.common.util.URI;
>@@ -23,8 +22,7 @@
> * @see org.apache.ws.muse.descriptor.util.DescriptorResourceFactoryImpl
> * @generated
> */
>-public class DescriptorResourceImpl extends XMLResourceImpl
>-{
>+public class DescriptorResourceImpl extends XMLResourceImpl {
> 	/**
> 	 * Creates an instance of the resource.
> 	 * 
>Index: src/org/apache/ws/muse/descriptor/util/DescriptorSwitch.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.model/src/org/apache/ws/muse/descriptor/util/DescriptorSwitch.java,v
>retrieving revision 1.8
>diff -u -r1.8 DescriptorSwitch.java
>--- src/org/apache/ws/muse/descriptor/util/DescriptorSwitch.java	10 Nov 2006 21:19:38 -0000	1.8
>+++ src/org/apache/ws/muse/descriptor/util/DescriptorSwitch.java	18 Jan 2007 15:27:26 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 IBM Corporation and others.
>+ * Copyright (c) 2007 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -9,7 +9,6 @@
> * 	Balan Subramanian (bsubram@us.ibm.com)
> * IBM Corporation - initial API and implementation
> *******************************************************************************/
>-
> package org.apache.ws.muse.descriptor.util;
> 
> import java.util.List;
>Index: src/org/apache/ws/muse/descriptor/util/DescriptorXMLProcessor.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.model/src/org/apache/ws/muse/descriptor/util/DescriptorXMLProcessor.java,v
>retrieving revision 1.8
>diff -u -r1.8 DescriptorXMLProcessor.java
>--- src/org/apache/ws/muse/descriptor/util/DescriptorXMLProcessor.java	10 Nov 2006 21:19:39 -0000	1.8
>+++ src/org/apache/ws/muse/descriptor/util/DescriptorXMLProcessor.java	18 Jan 2007 15:27:26 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 IBM Corporation and others.
>+ * Copyright (c) 2007 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -9,7 +9,6 @@
> * 	Balan Subramanian (bsubram@us.ibm.com)
> * IBM Corporation - initial API and implementation
> *******************************************************************************/
>-
> package org.apache.ws.muse.descriptor.util;
> 
> import java.util.Map;
>@@ -26,9 +25,7 @@
> * 
> * @generated
> */
>-public class DescriptorXMLProcessor extends XMLProcessor
>-{
>-
>+public class DescriptorXMLProcessor extends XMLProcessor {
> 	/**
> 	 * Public constructor to instantiate the helper.
> 	 * 
>Index: src/org/apache/ws/muse/descriptor/util/DescriptorAdapterFactory.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.model/src/org/apache/ws/muse/descriptor/util/DescriptorAdapterFactory.java,v
>retrieving revision 1.8
>diff -u -r1.8 DescriptorAdapterFactory.java
>--- src/org/apache/ws/muse/descriptor/util/DescriptorAdapterFactory.java	10 Nov 2006 21:19:39 -0000	1.8
>+++ src/org/apache/ws/muse/descriptor/util/DescriptorAdapterFactory.java	18 Jan 2007 15:27:26 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 IBM Corporation and others.
>+ * Copyright (c) 2007 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -9,7 +9,6 @@
> * 	Balan Subramanian (bsubram@us.ibm.com)
> * IBM Corporation - initial API and implementation
> *******************************************************************************/
>-
> package org.apache.ws.muse.descriptor.util;
> 
> import org.apache.ws.muse.descriptor.*;
>@@ -29,8 +28,7 @@
> * @see org.apache.ws.muse.descriptor.DescriptorPackage
> * @generated
> */
>-public class DescriptorAdapterFactory extends AdapterFactoryImpl
>-{
>+public class DescriptorAdapterFactory extends AdapterFactoryImpl {
> 	/**
> 	 * The cached model package.
> 	 * 
>Index: model/descriptor.ecore
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.model/model/descriptor.ecore,v
>retrieving revision 1.3
>diff -u -r1.3 descriptor.ecore
>--- model/descriptor.ecore	10 Nov 2006 21:19:39 -0000	1.3
>+++ model/descriptor.ecore	18 Jan 2007 15:27:06 -0000
>@@ -2,7 +2,7 @@
> <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="descriptor"
>- nsURI="http://ws.apache.org/muse/descriptor" nsPrefix="descriptor">
>+ nsURI="http://ws.apache.org/muse/descriptor" nsPrefix="">
> <eClassifiers xsi:type="ecore:EClass" name="AdditionalJarsType">
> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
> <details key="name" value="additional-jars_._type"/>
>@@ -679,7 +679,7 @@
> </eAnnotations>
> </eStructuralFeatures>
> <eStructuralFeatures xsi:type="ecore:EAttribute" name="wsdlPortType" unique="false"
>- lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//QName">
>+ lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
> <details key="kind" value="element"/>
> <details key="name" value="wsdl-port-type"/>
>Index: model/descriptor.genmodel
>===================================================================
>RCS file: model/descriptor.genmodel
>diff -N model/descriptor.genmodel
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ model/descriptor.genmodel	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,119 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<genmodel:GenModel xmi:version="2.0"
>+ xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
>+ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.tptp.wsdm.tooling.model/src"
>+ modelPluginID="org.eclipse.tptp.wsdm.tooling.model" modelName="Descriptor" importerID="org.eclipse.emf.importer.ecore">
>+ <foreignModel>descriptor.ecore</foreignModel>
>+ <genPackages prefix="Descriptor" basePackage="org.apache.ws.muse" resource="XML"
>+ disposableProviderFactory="true" ecorePackage="descriptor.ecore#/">
>+ <genEnums ecoreEnum="descriptor.ecore#//LogLevelType">
>+ <genEnumLiterals ecoreEnumLiteral="descriptor.ecore#//LogLevelType/OFF"/>
>+ <genEnumLiterals ecoreEnumLiteral="descriptor.ecore#//LogLevelType/SEVERE"/>
>+ <genEnumLiterals ecoreEnumLiteral="descriptor.ecore#//LogLevelType/WARNING"/>
>+ <genEnumLiterals ecoreEnumLiteral="descriptor.ecore#//LogLevelType/INFO"/>
>+ <genEnumLiterals ecoreEnumLiteral="descriptor.ecore#//LogLevelType/CONFIG"/>
>+ <genEnumLiterals ecoreEnumLiteral="descriptor.ecore#//LogLevelType/FINE"/>
>+ <genEnumLiterals ecoreEnumLiteral="descriptor.ecore#//LogLevelType/FINER"/>
>+ <genEnumLiterals ecoreEnumLiteral="descriptor.ecore#//LogLevelType/FINEST"/>
>+ <genEnumLiterals ecoreEnumLiteral="descriptor.ecore#//LogLevelType/ALL"/>
>+ </genEnums>
>+ <genDataTypes ecoreDataType="descriptor.ecore#//LogLevelTypeObject"/>
>+ <genClasses ecoreClass="descriptor.ecore#//AdditionalJarsType">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute descriptor.ecore#//AdditionalJarsType/jarPath"/>
>+ </genClasses>
>+ <genClasses ecoreClass="descriptor.ecore#//CapabilityType">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute descriptor.ecore#//CapabilityType/capabilityUri"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute descriptor.ecore#//CapabilityType/javaCapabilityClass"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference descriptor.ecore#//CapabilityType/persistence"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference descriptor.ecore#//CapabilityType/initParam"/>
>+ </genClasses>
>+ <genClasses ecoreClass="descriptor.ecore#//CustomSerializerType">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute descriptor.ecore#//CustomSerializerType/javaSerializableType"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute descriptor.ecore#//CustomSerializerType/javaSerializerClass"/>
>+ </genClasses>
>+ <genClasses ecoreClass="descriptor.ecore#//DocumentRoot">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute descriptor.ecore#//DocumentRoot/mixed"/>
>+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference descriptor.ecore#//DocumentRoot/xMLNSPrefixMap"/>
>+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference descriptor.ecore#//DocumentRoot/xSISchemaLocation"/>
>+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference descriptor.ecore#//DocumentRoot/additionalJars"/>
>+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference descriptor.ecore#//DocumentRoot/capability"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute descriptor.ecore#//DocumentRoot/capabilityUri"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute descriptor.ecore#//DocumentRoot/contextPath"/>
>+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference descriptor.ecore#//DocumentRoot/customSerializer"/>
>+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference descriptor.ecore#//DocumentRoot/initialInstances"/>
>+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference descriptor.ecore#//DocumentRoot/initParam"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute descriptor.ecore#//DocumentRoot/jarPath"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute descriptor.ecore#//DocumentRoot/javaCapabilityClass"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute descriptor.ecore#//DocumentRoot/javaIdFactoryClass"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute descriptor.ecore#//DocumentRoot/javaPersistenceClass"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute descriptor.ecore#//DocumentRoot/javaResourceClass"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute descriptor.ecore#//DocumentRoot/javaRouterClass"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute descriptor.ecore#//DocumentRoot/javaSerializableType"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute descriptor.ecore#//DocumentRoot/javaSerializerClass"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute descriptor.ecore#//DocumentRoot/logFile"/>
>+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference descriptor.ecore#//DocumentRoot/logging"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute descriptor.ecore#//DocumentRoot/logLevel"/>
>+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference descriptor.ecore#//DocumentRoot/muse"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute descriptor.ecore#//DocumentRoot/paramName"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute descriptor.ecore#//DocumentRoot/paramValue"/>
>+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference descriptor.ecore#//DocumentRoot/persistence"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute descriptor.ecore#//DocumentRoot/persistenceLocation"/>
>+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference descriptor.ecore#//DocumentRoot/referenceParameters"/>
>+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference descriptor.ecore#//DocumentRoot/resourceType"/>
>+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference descriptor.ecore#//DocumentRoot/root"/>
>+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference descriptor.ecore#//DocumentRoot/router"/>
>+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference descriptor.ecore#//DocumentRoot/wsdl"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute descriptor.ecore#//DocumentRoot/wsdlFile"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute descriptor.ecore#//DocumentRoot/wsdlPortType"/>
>+ </genClasses>
>+ <genClasses ecoreClass="descriptor.ecore#//InitialInstancesType">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference descriptor.ecore#//InitialInstancesType/resourceType"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference descriptor.ecore#//InitialInstancesType/referenceParameters"/>
>+ </genClasses>
>+ <genClasses ecoreClass="descriptor.ecore#//InitParamType">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute descriptor.ecore#//InitParamType/paramName"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute descriptor.ecore#//InitParamType/paramValue"/>
>+ </genClasses>
>+ <genClasses ecoreClass="descriptor.ecore#//LoggingType">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute descriptor.ecore#//LoggingType/logFile"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute descriptor.ecore#//LoggingType/logLevel"/>
>+ </genClasses>
>+ <genClasses ecoreClass="descriptor.ecore#//MuseType">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference descriptor.ecore#//MuseType/router"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference descriptor.ecore#//MuseType/resourceType"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference descriptor.ecore#//MuseType/customSerializer"/>
>+ </genClasses>
>+ <genClasses ecoreClass="descriptor.ecore#//PersistenceType">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute descriptor.ecore#//PersistenceType/javaPersistenceClass"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute descriptor.ecore#//PersistenceType/persistenceLocation"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference descriptor.ecore#//PersistenceType/initParam"/>
>+ </genClasses>
>+ <genClasses ecoreClass="descriptor.ecore#//ReferenceParametersType">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute descriptor.ecore#//ReferenceParametersType/any"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute descriptor.ecore#//ReferenceParametersType/anyAttribute"/>
>+ </genClasses>
>+ <genClasses ecoreClass="descriptor.ecore#//ResourceTypeType">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute descriptor.ecore#//ResourceTypeType/contextPath"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference descriptor.ecore#//ResourceTypeType/wsdl"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute descriptor.ecore#//ResourceTypeType/javaIdFactoryClass"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute descriptor.ecore#//ResourceTypeType/javaResourceClass"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference descriptor.ecore#//ResourceTypeType/capability"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference descriptor.ecore#//ResourceTypeType/initParam"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute descriptor.ecore#//ResourceTypeType/useRouterPersistence"/>
>+ </genClasses>
>+ <genClasses ecoreClass="descriptor.ecore#//RootType">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference descriptor.ecore#//RootType/muse"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference descriptor.ecore#//RootType/initialInstances"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference descriptor.ecore#//RootType/additionalJars"/>
>+ </genClasses>
>+ <genClasses ecoreClass="descriptor.ecore#//RouterType">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute descriptor.ecore#//RouterType/javaRouterClass"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference descriptor.ecore#//RouterType/logging"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference descriptor.ecore#//RouterType/persistence"/>
>+ </genClasses>
>+ <genClasses ecoreClass="descriptor.ecore#//WsdlType">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute descriptor.ecore#//WsdlType/wsdlFile"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute descriptor.ecore#//WsdlType/wsdlPortType"/>
>+ </genClasses>
>+ </genPackages>
>+</genmodel:GenModel>
>#P org.eclipse.tptp.wsdm.tooling.editor.dde
>Index: src/org/eclipse/tptp/wsdm/tooling/editor/dde/util/internal/DdeUtil.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.editor.dde/src/org/eclipse/tptp/wsdm/tooling/editor/dde/util/internal/DdeUtil.java,v
>retrieving revision 1.8
>diff -u -r1.8 DdeUtil.java
>--- src/org/eclipse/tptp/wsdm/tooling/editor/dde/util/internal/DdeUtil.java	9 Jan 2007 19:54:14 -0000	1.8
>+++ src/org/eclipse/tptp/wsdm/tooling/editor/dde/util/internal/DdeUtil.java	18 Jan 2007 15:27:32 -0000
>@@ -58,11 +58,11 @@
> import org.eclipse.tptp.wsdm.tooling.model.capabilities.Property;
> import org.eclipse.tptp.wsdm.tooling.model.manageableResourceType.ManageableResourceType;
> import org.eclipse.tptp.wsdm.tooling.nls.messages.dde.internal.Messages;
>-import org.eclipse.tptp.wsdm.tooling.util.internal.WsdmToolingLog;
> import org.eclipse.tptp.wsdm.tooling.util.internal.Definition2Capability;
> import org.eclipse.tptp.wsdm.tooling.util.internal.MrtUtils;
> import org.eclipse.tptp.wsdm.tooling.util.internal.MyDescriptorResourceFactoryImpl;
> import org.eclipse.tptp.wsdm.tooling.util.internal.WsdlUtils;
>+import org.eclipse.tptp.wsdm.tooling.util.internal.WsdmToolingLog;
> import org.eclipse.ui.IWorkbench;
> import org.eclipse.ui.IWorkbenchPage;
> import org.eclipse.ui.IWorkbenchWindow;
>@@ -262,10 +262,7 @@
> 		String namespace = mrt.getNamespace();
> 		String prefix = getOrCreatePrefix(root, namespace);
> 		String localPart = Messages.DU_PORT_TYPE_LOCAL_PART; // Only "PortType" should come with the //$NON-NLS-1$
>-		// prefix.
>-		org.eclipse.emf.ecore.xml.type.internal.QName qname = new org.eclipse.emf.ecore.xml.type.internal.QName(
>-				namespace, localPart, prefix);
>-		wsdlType.setWsdlPortType(qname);
>+		wsdlType.setWsdlPortType(prefix+":"+localPart);
> 
> 		rtd.setWsdl(wsdlType);
> 
>Index: src/org/eclipse/tptp/wsdm/tooling/editor/dde/util/internal/LoaderUtil.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.editor.dde/src/org/eclipse/tptp/wsdm/tooling/editor/dde/util/internal/LoaderUtil.java,v
>retrieving revision 1.5
>diff -u -r1.5 LoaderUtil.java
>--- src/org/eclipse/tptp/wsdm/tooling/editor/dde/util/internal/LoaderUtil.java	9 Jan 2007 19:54:14 -0000	1.5
>+++ src/org/eclipse/tptp/wsdm/tooling/editor/dde/util/internal/LoaderUtil.java	18 Jan 2007 15:27:32 -0000
>@@ -193,15 +193,18 @@
> 		// Synchronize the context path
> 		rt.setContextPath("/" + mrt.getIdentifier()); //$NON-NLS-1$
> 		// Synchronize the namespace and wsdl-porttype
>-		org.eclipse.emf.ecore.xml.type.internal.QName qname = (org.eclipse.emf.ecore.xml.type.internal.QName) rt
>-				.getWsdl().getWsdlPortType();
>-		String localPart = Messages.DU_PORT_TYPE_LOCAL_PART; //$NON-NLS-1$
>-		String prefix = replaceNamespace(root, qname.getNamespaceURI(), mrt
>-				.getNamespace());
>-		String namespace = mrt.getNamespace();
>-		org.eclipse.emf.ecore.xml.type.internal.QName newQname = new org.eclipse.emf.ecore.xml.type.internal.QName(
>-				namespace, localPart, prefix);
>-		rt.getWsdl().setWsdlPortType(newQname);
>+		String wsdlPortType = (String) rt.getWsdl().getWsdlPortType();
>+		String prefix = getPrefix(wsdlPortType);
>+		if(prefix!=null)
>+		{
>+			String oldNamespace = getNamespace(root, prefix);
>+			if(oldNamespace!=null)
>+			{
>+				String localPart = Messages.DU_PORT_TYPE_LOCAL_PART;
>+				String newPrefix = replaceNamespace(root, oldNamespace, mrt.getNamespace());
>+				rt.getWsdl().setWsdlPortType(newPrefix+":"+localPart);
>+			}			
>+		}
> 		// Synchronize the capabilities inside MRT
> 		// Remove the nonexistent capabilities
> 		List mrtCapabilities = DdeUtil.getCapabilitiesFromMRT(mrt);
>@@ -224,6 +227,34 @@
> 			}
> 		}
> 	}
>+	
>+	// Input should be tns:PortType
>+	private static String getPrefix(String str)
>+	{
>+		if(str==null || str.trim().equals("") || str.indexOf(':')==-1)
>+			return null;
>+		return str.substring(0,str.indexOf(':'));
>+	}
>+	
>+	// Given the prefix will return the namespace associated with it
>+	private static String getNamespace(DocumentRoot root, String prefix)
>+	{
>+		if(root==null || prefix==null || prefix.trim().equals(""))
>+			return null;
>+		EMap map = root.getXMLNSPrefixMap();
>+		Iterator keyIt = map.iterator();
>+		while (keyIt.hasNext())
>+		{
>+			Object object = keyIt.next();
>+			if (object instanceof EStringToStringMapEntryImpl)
>+			{
>+				EStringToStringMapEntryImpl entry = (EStringToStringMapEntryImpl) object;
>+				if(entry.getKey().equals(prefix))
>+					return (String) entry.getValue();
>+			}
>+		}
>+		return null;
>+	}
> 
> 	// Will replace the old namespace with new namespace and return prefix
> 	// associated with it
>@@ -247,7 +278,7 @@
> 		}
> 		return null;
> 	}
>-
>+	
> 	private static boolean isExists(CapabilityType capability, List capabilities)
> 	{
> 		if(capabilities == null)
>#P org.eclipse.tptp.wsdm.tooling.editor.mrt
>Index: src/org/eclipse/tptp/wsdm/tooling/wizard/mrt/internal/SubscriptionManagerInspector.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.editor.mrt/src/org/eclipse/tptp/wsdm/tooling/wizard/mrt/internal/SubscriptionManagerInspector.java,v
>retrieving revision 1.8
>diff -u -r1.8 SubscriptionManagerInspector.java
>--- src/org/eclipse/tptp/wsdm/tooling/wizard/mrt/internal/SubscriptionManagerInspector.java	12 Dec 2006 04:50:22 -0000	1.8
>+++ src/org/eclipse/tptp/wsdm/tooling/wizard/mrt/internal/SubscriptionManagerInspector.java	18 Jan 2007 15:27:35 -0000
>@@ -19,6 +19,7 @@
> 
> import javax.xml.namespace.QName;
> 
>+import org.apache.muse.tools.Activator;
> import org.apache.muse.util.xml.XmlUtils;
> import org.apache.ws.muse.descriptor.CapabilityType;
> import org.apache.ws.muse.descriptor.DescriptorFactory;
>@@ -35,7 +36,6 @@
> import org.eclipse.emf.common.util.URI;
> import org.eclipse.emf.ecore.resource.ResourceSet;
> import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
>-import org.apache.muse.tools.Activator;
> import org.eclipse.tptp.wsdm.tooling.model.manageableResourceType.ManageableResourceType;
> import org.eclipse.tptp.wsdm.tooling.model.manageableResourceType.ManageableResourceTypeFactory;
> import org.eclipse.tptp.wsdm.tooling.util.internal.EclipseUtils;
>@@ -189,10 +189,7 @@
> 				+ "SubscriptionManager.wsdl");
> 		_root.getXMLNSPrefixMap().put("wsn",
> 				"http://docs.oasis-open.org/wsn/b-2/SubscriptionManager");
>-		org.eclipse.emf.ecore.xml.type.internal.QName qname = new org.eclipse.emf.ecore.xml.type.internal.QName(
>-				"http://docs.oasis-open.org/wsn/b-2/SubscriptionManager",
>-				"PortType", "wsn");
>-		wsdlType.setWsdlPortType(qname);
>+		wsdlType.setWsdlPortType("wsn:PortType");
> 		resourceType.setWsdl(wsdlType);
> 
> 		CapabilityType identity = DescriptorFactory.eINSTANCE
>Index: src/org/eclipse/tptp/wsdm/tooling/wizard/mrt/internal/BasicMrtInspector.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.editor.mrt/src/org/eclipse/tptp/wsdm/tooling/wizard/mrt/internal/BasicMrtInspector.java,v
>retrieving revision 1.5
>diff -u -r1.5 BasicMrtInspector.java
>--- src/org/eclipse/tptp/wsdm/tooling/wizard/mrt/internal/BasicMrtInspector.java	10 Nov 2006 21:19:11 -0000	1.5
>+++ src/org/eclipse/tptp/wsdm/tooling/wizard/mrt/internal/BasicMrtInspector.java	18 Jan 2007 15:27:35 -0000
>@@ -151,9 +151,7 @@
> 		// with the
> 		// //$NON-NLS-1$
> 		// prefix.
>-		org.eclipse.emf.ecore.xml.type.internal.QName qname = new org.eclipse.emf.ecore.xml.type.internal.QName(
>-				namespace, localPart, prefix);
>-		wsdlType.setWsdlPortType(qname);
>+		wsdlType.setWsdlPortType(prefix+":"+localPart);
> 
> 		rtd.setWsdl(wsdlType);
>

Actions: View | Diff

Attachments on bug 161932: 52511 | 56198 | 57069 | 57084 | 57207 | 57493