Remove direct access to private packages

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@704742 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 5 insertions, 10 deletions

diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/pom.xml b/branches/sca-equinox/modules/interface-wsdl-xml/pom.xml
index 41f93099f4..39b523bf4d 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/pom.xml
+++ b/branches/sca-equinox/modules/interface-wsdl-xml/pom.xml
@@ -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>
diff --git a/branches/sca-equinox/modules/interface-wsdl/pom.xml b/branches/sca-equinox/modules/interface-wsdl/pom.xml
index bb1e630b0a..891b453d3d 100644
--- a/branches/sca-equinox/modules/interface-wsdl/pom.xml
+++ b/branches/sca-equinox/modules/interface-wsdl/pom.xml
@@ -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>
diff --git a/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java b/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java
index 16e9cf43f3..82a7aa1200 100644
--- a/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java
+++ b/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java
@@ -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 javax.xml.namespace.QName;
 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 @@ public class WSDLDefinitionImpl implements WSDLDefinition {
             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 @@ public class WSDLDefinitionImpl implements WSDLDefinition {
             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;
             }
diff --git a/branches/sca-equinox/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDefinitionImpl.java b/branches/sca-equinox/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDefinitionImpl.java
index e57cbee8b8..5a2b4ec8e6 100644
--- a/branches/sca-equinox/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDefinitionImpl.java
+++ b/branches/sca-equinox/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDefinitionImpl.java
@@ -165,7 +165,7 @@ public class XSDefinitionImpl implements XSDefinition {
         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) {