Author: rfeng
Date: Tue Oct 14 16:55:22 2008
New Revision: 704742
URL: http://svn.apache.org/viewvc?rev=704742&view=rev
Log:
Remove direct access to private packages
Modified:
tuscany/branches/sca-equinox/modules/interface-wsdl-xml/pom.xml
tuscany/branches/sca-equinox/modules/interface-wsdl/pom.xml
tuscany/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java
tuscany/branches/sca-equinox/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDefinitionImpl.java
Modified: tuscany/branches/sca-equinox/modules/interface-wsdl-xml/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/interface-wsdl-xml/pom.xml?rev=704742&r1=704741&r2=704742&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/interface-wsdl-xml/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/interface-wsdl-xml/pom.xml Tue Oct 14
16:55:22 2008
@@ -78,7 +78,7 @@
<Bundle-Version>${tuscany.version}</Bundle-Version>
<Bundle-SymbolicName>org.apache.tuscany.sca.interface.wsdl.xml</Bundle-SymbolicName>
<Bundle-Description>${pom.name}</Bundle-Description>
-
<Export-Package>org.apache.tuscany.sca.interfacedef.wsdl.xml*</Export-Package>
+ <Export-Package></Export-Package>
</instructions>
</configuration>
</plugin>
Modified: tuscany/branches/sca-equinox/modules/interface-wsdl/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/interface-wsdl/pom.xml?rev=704742&r1=704741&r2=704742&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/interface-wsdl/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/interface-wsdl/pom.xml Tue Oct 14
16:55:22 2008
@@ -93,7 +93,7 @@
<Bundle-Version>${tuscany.version}</Bundle-Version>
<Bundle-SymbolicName>org.apache.tuscany.sca.interface.wsdl</Bundle-SymbolicName>
<Bundle-Description>${pom.name}</Bundle-Description>
-
<Export-Package>org.apache.tuscany.sca.interfacedef.wsdl*</Export-Package>
+
<Export-Package>org.apache.tuscany.sca.interfacedef.wsdl</Export-Package>
</instructions>
</configuration>
</plugin>
Modified:
tuscany/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java?rev=704742&r1=704741&r2=704742&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java
(original)
+++
tuscany/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java
Tue Oct 14 16:55:22 2008
@@ -19,8 +19,6 @@
package org.apache.tuscany.sca.interfacedef.wsdl.impl;
-import static
org.apache.tuscany.sca.xsd.impl.XSDefinitionImpl.getXmlSchemaObject;
-
import java.net.URI;
import java.util.ArrayList;
import java.util.List;
@@ -38,7 +36,6 @@
import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;
import org.apache.tuscany.sca.interfacedef.wsdl.WSDLObject;
import org.apache.tuscany.sca.xsd.XSDefinition;
-import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaCollection;
import org.apache.ws.commons.schema.XmlSchemaElement;
import org.apache.ws.commons.schema.XmlSchemaType;
@@ -207,8 +204,7 @@
if (schemaCollection == null && xsd.getSchemaCollection() != null)
{
schemaCollection = xsd.getSchemaCollection();
}
- XmlSchema schema = xsd.getSchema();
- XmlSchemaElement element = getXmlSchemaObject(schema, name,
XmlSchemaElement.class);
+ XmlSchemaElement element = xsd.getXmlSchemaElement(name);
if (element != null) {
return element;
}
@@ -228,8 +224,7 @@
if (xsd.getSchemaCollection() != null) {
schemaCollection = xsd.getSchemaCollection();
}
- XmlSchema schema = xsd.getSchema();
- XmlSchemaType type = getXmlSchemaObject(schema, name,
XmlSchemaType.class);
+ XmlSchemaType type = xsd.getXmlSchemaType(name);
if (type != null) {
return type;
}
Modified:
tuscany/branches/sca-equinox/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDefinitionImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDefinitionImpl.java?rev=704742&r1=704741&r2=704742&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDefinitionImpl.java
(original)
+++
tuscany/branches/sca-equinox/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDefinitionImpl.java
Tue Oct 14 16:55:22 2008
@@ -165,7 +165,7 @@
return true;
}
- public static <T extends XmlSchemaObject> T getXmlSchemaObject(XmlSchema
schema, QName name, Class<T> type) {
+ private static <T extends XmlSchemaObject> T getXmlSchemaObject(XmlSchema
schema, QName name, Class<T> type) {
if (schema != null) {
XmlSchemaObject object = null;
if (type == XmlSchemaElement.class) {
