You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hivemind.apache.org by ah...@apache.org on 2006/11/02 15:36:22 UTC
svn commit: r470376 - in /hivemind/branches/branch-2-0-annot:
annotations/src/java/org/apache/hivemind/annotations/internal/
framework/src/java/org/apache/hivemind/definition/
framework/src/java/org/apache/hivemind/impl/
framework/src/java/org/apache/h...
Author: ahuegen
Date: Thu Nov 2 06:36:20 2006
New Revision: 470376
URL: http://svn.apache.org/viewvc?view=rev&rev=470376
Log:
Moved Visibility from internal to definition package
Added:
hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/Visibility.java (contents, props changed)
- copied, changed from r470270, hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/internal/Visibility.java
Removed:
hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/internal/Visibility.java
Modified:
hivemind/branches/branch-2-0-annot/annotations/src/java/org/apache/hivemind/annotations/internal/AnnotatedModuleProcessor.java
hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ConfigurationPointDefinition.java
hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ExtensionPointDefinition.java
hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ModuleDefinitionHelper.java
hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ServicePointDefinition.java
hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/AbstractExtensionPoint.java
hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/ExtensionResolver.java
hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/test/HiveMindTestCase.java
hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/FrameworkTestCase.java
hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/TestToString.java
hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestInterceptors.java
hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestRegistryInfrastructure.java
hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestServicePoint.java
hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestVisibility.java
hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/ant/RegistrySerializer.java
hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/ConfigurationPointDescriptor.java
hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/DescriptorParser.java
hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/ServicePointDescriptor.java
hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/schema/impl/SchemaImpl.java
hivemind/branches/branch-2-0-annot/xml/src/test/hivemind/test/parse/TestDescriptorParser.java
hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/impl/TestXmlModuleDescriptorProcessor.java
Modified: hivemind/branches/branch-2-0-annot/annotations/src/java/org/apache/hivemind/annotations/internal/AnnotatedModuleProcessor.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/annotations/src/java/org/apache/hivemind/annotations/internal/AnnotatedModuleProcessor.java?view=diff&rev=470376&r1=470375&r2=470376
==============================================================================
--- hivemind/branches/branch-2-0-annot/annotations/src/java/org/apache/hivemind/annotations/internal/AnnotatedModuleProcessor.java (original)
+++ hivemind/branches/branch-2-0-annot/annotations/src/java/org/apache/hivemind/annotations/internal/AnnotatedModuleProcessor.java Thu Nov 2 06:36:20 2006
@@ -20,11 +20,11 @@
import org.apache.hivemind.definition.RegistryDefinition;
import org.apache.hivemind.definition.ServiceImplementationDefinition;
import org.apache.hivemind.definition.ServicePointDefinition;
+import org.apache.hivemind.definition.Visibility;
import org.apache.hivemind.definition.construction.ConfigurationConstructor;
import org.apache.hivemind.definition.construction.ContributionConstructor;
import org.apache.hivemind.definition.construction.ImplementationConstructor;
import org.apache.hivemind.impl.LocationImpl;
-import org.apache.hivemind.internal.Visibility;
import org.apache.hivemind.util.ClasspathResource;
import org.apache.hivemind.util.IdUtils;
Modified: hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ConfigurationPointDefinition.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ConfigurationPointDefinition.java?view=diff&rev=470376&r1=470375&r2=470376
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ConfigurationPointDefinition.java (original)
+++ hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ConfigurationPointDefinition.java Thu Nov 2 06:36:20 2006
@@ -6,7 +6,6 @@
import org.apache.hivemind.Location;
import org.apache.hivemind.Occurances;
import org.apache.hivemind.definition.construction.ConfigurationConstructor;
-import org.apache.hivemind.internal.Visibility;
public class ConfigurationPointDefinition extends ExtensionPointDefinition
{
Modified: hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ExtensionPointDefinition.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ExtensionPointDefinition.java?view=diff&rev=470376&r1=470375&r2=470376
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ExtensionPointDefinition.java (original)
+++ hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ExtensionPointDefinition.java Thu Nov 2 06:36:20 2006
@@ -4,7 +4,6 @@
import java.util.Map;
import org.apache.hivemind.Location;
-import org.apache.hivemind.internal.Visibility;
import org.apache.hivemind.util.Defense;
public class ExtensionPointDefinition
Modified: hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ModuleDefinitionHelper.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ModuleDefinitionHelper.java?view=diff&rev=470376&r1=470375&r2=470376
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ModuleDefinitionHelper.java (original)
+++ hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ModuleDefinitionHelper.java Thu Nov 2 06:36:20 2006
@@ -6,7 +6,6 @@
import org.apache.hivemind.definition.construction.ImplementationConstructor;
import org.apache.hivemind.impl.CreateClassServiceConstructor;
import org.apache.hivemind.internal.ServiceModel;
-import org.apache.hivemind.internal.Visibility;
public class ModuleDefinitionHelper
{
Modified: hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ServicePointDefinition.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ServicePointDefinition.java?view=diff&rev=470376&r1=470375&r2=470376
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ServicePointDefinition.java (original)
+++ hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ServicePointDefinition.java Thu Nov 2 06:36:20 2006
@@ -5,7 +5,6 @@
import java.util.List;
import org.apache.hivemind.Location;
-import org.apache.hivemind.internal.Visibility;
public class ServicePointDefinition extends ExtensionPointDefinition
{
Copied: hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/Visibility.java (from r470270, hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/internal/Visibility.java)
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/Visibility.java?view=diff&rev=470376&p1=hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/internal/Visibility.java&r1=470270&p2=hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/Visibility.java&r2=470376
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/internal/Visibility.java (original)
+++ hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/Visibility.java Thu Nov 2 06:36:20 2006
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.hivemind.internal;
+package org.apache.hivemind.definition;
/**
- * The visibility of a configuruation point, extension point, or schema.
+ * The visibility of a configuration point, extension point, or schema.
*
* @since 1.1
*/
Propchange: hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/Visibility.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.2
Propchange: hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/Visibility.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/Visibility.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/AbstractExtensionPoint.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/AbstractExtensionPoint.java?view=diff&rev=470376&r1=470375&r2=470376
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/AbstractExtensionPoint.java (original)
+++ hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/AbstractExtensionPoint.java Thu Nov 2 06:36:20 2006
@@ -19,9 +19,9 @@
import org.apache.hivemind.ErrorLog;
import org.apache.hivemind.Location;
import org.apache.hivemind.definition.ExtensionPointDefinition;
+import org.apache.hivemind.definition.Visibility;
import org.apache.hivemind.internal.ExtensionPoint;
import org.apache.hivemind.internal.Module;
-import org.apache.hivemind.internal.Visibility;
import org.apache.hivemind.util.ToStringBuilder;
/**
Modified: hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/ExtensionResolver.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/ExtensionResolver.java?view=diff&rev=470376&r1=470375&r2=470376
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/ExtensionResolver.java (original)
+++ hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/ExtensionResolver.java Thu Nov 2 06:36:20 2006
@@ -15,7 +15,7 @@
import org.apache.hivemind.definition.ServiceInterceptorDefinition;
import org.apache.hivemind.definition.ServicePointDefinition;
import org.apache.hivemind.definition.UnresolvedExtension;
-import org.apache.hivemind.internal.Visibility;
+import org.apache.hivemind.definition.Visibility;
import org.apache.hivemind.util.IdUtils;
/**
Modified: hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/test/HiveMindTestCase.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/test/HiveMindTestCase.java?view=diff&rev=470376&r1=470375&r2=470376
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/test/HiveMindTestCase.java (original)
+++ hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/test/HiveMindTestCase.java Thu Nov 2 06:36:20 2006
@@ -29,6 +29,7 @@
import org.apache.hivemind.Registry;
import org.apache.hivemind.Resource;
import org.apache.hivemind.definition.ModuleDefinition;
+import org.apache.hivemind.definition.RegistryDefinition;
import org.apache.hivemind.impl.DefaultClassResolver;
import org.apache.hivemind.impl.LocationImpl;
import org.apache.hivemind.impl.RegistryBuilder;
@@ -410,14 +411,14 @@
*/
protected Registry buildFrameworkRegistry(ModuleDefinition[] customModules)
{
- RegistryBuilder builder = new RegistryBuilder();
-
+ RegistryDefinition registryDefinition = new RegistryDefinition();
for (int i = 0; i < customModules.length; i++)
{
ModuleDefinition module = customModules[i];
- builder.getRegistryDefinition().addModule(module);
+ registryDefinition.addModule(module);
}
+ RegistryBuilder builder = new RegistryBuilder(registryDefinition);
return builder.constructRegistry(Locale.getDefault());
}
Modified: hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/FrameworkTestCase.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/FrameworkTestCase.java?view=diff&rev=470376&r1=470375&r2=470376
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/FrameworkTestCase.java (original)
+++ hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/FrameworkTestCase.java Thu Nov 2 06:36:20 2006
@@ -23,9 +23,9 @@
import org.apache.hivemind.definition.ModuleDefinition;
import org.apache.hivemind.definition.ServiceImplementationDefinition;
import org.apache.hivemind.definition.ServicePointDefinition;
+import org.apache.hivemind.definition.Visibility;
import org.apache.hivemind.impl.CreateClassServiceConstructor;
import org.apache.hivemind.impl.DefaultClassResolver;
-import org.apache.hivemind.internal.Visibility;
import org.apache.hivemind.test.HiveMindTestCase;
/**
Modified: hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/TestToString.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/TestToString.java?view=diff&rev=470376&r1=470375&r2=470376
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/TestToString.java (original)
+++ hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/TestToString.java Thu Nov 2 06:36:20 2006
@@ -21,13 +21,13 @@
import org.apache.hivemind.definition.ModuleDefinition;
import org.apache.hivemind.definition.ServiceImplementationDefinition;
import org.apache.hivemind.definition.ServicePointDefinition;
+import org.apache.hivemind.definition.Visibility;
import org.apache.hivemind.impl.InterceptorStackImpl;
import org.apache.hivemind.impl.ModuleImpl;
import org.apache.hivemind.impl.RegistryInfrastructureImpl;
import org.apache.hivemind.impl.ServicePointImpl;
import org.apache.hivemind.internal.ServiceModel;
import org.apache.hivemind.internal.ServicePoint;
-import org.apache.hivemind.internal.Visibility;
import org.easymock.MockControl;
/**
Modified: hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestInterceptors.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestInterceptors.java?view=diff&rev=470376&r1=470375&r2=470376
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestInterceptors.java (original)
+++ hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestInterceptors.java Thu Nov 2 06:36:20 2006
@@ -24,8 +24,8 @@
import org.apache.hivemind.definition.OrderedServiceInterceptorDefinition;
import org.apache.hivemind.definition.ServiceInterceptorDefinition;
import org.apache.hivemind.definition.ServicePointDefinition;
+import org.apache.hivemind.definition.Visibility;
import org.apache.hivemind.internal.Module;
-import org.apache.hivemind.internal.Visibility;
/**
* Test for interceptors.
Modified: hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestRegistryInfrastructure.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestRegistryInfrastructure.java?view=diff&rev=470376&r1=470375&r2=470376
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestRegistryInfrastructure.java (original)
+++ hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestRegistryInfrastructure.java Thu Nov 2 06:36:20 2006
@@ -16,10 +16,10 @@
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.definition.ModuleDefinition;
import org.apache.hivemind.definition.ServicePointDefinition;
+import org.apache.hivemind.definition.Visibility;
import org.apache.hivemind.internal.ConfigurationPoint;
import org.apache.hivemind.internal.RegistryInfrastructure;
import org.apache.hivemind.internal.ServicePoint;
-import org.apache.hivemind.internal.Visibility;
import org.easymock.MockControl;
import hivemind.test.FrameworkTestCase;
Modified: hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestServicePoint.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestServicePoint.java?view=diff&rev=470376&r1=470375&r2=470376
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestServicePoint.java (original)
+++ hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestServicePoint.java Thu Nov 2 06:36:20 2006
@@ -26,10 +26,10 @@
import org.apache.hivemind.definition.ModuleDefinition;
import org.apache.hivemind.definition.ServiceImplementationDefinition;
import org.apache.hivemind.definition.ServicePointDefinition;
+import org.apache.hivemind.definition.Visibility;
import org.apache.hivemind.internal.Module;
import org.apache.hivemind.internal.ServiceModel;
import org.apache.hivemind.internal.ServiceModelFactory;
-import org.apache.hivemind.internal.Visibility;
import org.easymock.MockControl;
/**
Modified: hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestVisibility.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestVisibility.java?view=diff&rev=470376&r1=470375&r2=470376
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestVisibility.java (original)
+++ hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestVisibility.java Thu Nov 2 06:36:20 2006
@@ -20,10 +20,10 @@
import org.apache.commons.logging.LogFactory;
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.definition.ConfigurationPointDefinition;
+import org.apache.hivemind.definition.Visibility;
import org.apache.hivemind.internal.ConfigurationPoint;
import org.apache.hivemind.internal.Module;
import org.apache.hivemind.internal.ServicePoint;
-import org.apache.hivemind.internal.Visibility;
import org.apache.hivemind.service.ClassFactory;
import org.easymock.MockControl;
Modified: hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/ant/RegistrySerializer.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/ant/RegistrySerializer.java?view=diff&rev=470376&r1=470375&r2=470376
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/ant/RegistrySerializer.java (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/ant/RegistrySerializer.java Thu Nov 2 06:36:20 2006
@@ -35,6 +35,7 @@
import org.apache.hivemind.definition.ServiceImplementationDefinition;
import org.apache.hivemind.definition.ServiceInterceptorDefinition;
import org.apache.hivemind.definition.ServicePointDefinition;
+import org.apache.hivemind.definition.Visibility;
import org.apache.hivemind.definition.construction.ImplementationConstructor;
import org.apache.hivemind.impl.CreateClassServiceConstructor;
import org.apache.hivemind.impl.DefaultErrorHandler;
@@ -44,7 +45,6 @@
import org.apache.hivemind.impl.natures.XmlConfigurationPointNature;
import org.apache.hivemind.impl.natures.XmlRegistryNature;
import org.apache.hivemind.impl.natures.XmlServicePointNature;
-import org.apache.hivemind.internal.Visibility;
import org.apache.hivemind.parse.AttributeMappingDescriptor;
import org.apache.hivemind.parse.ConversionDescriptor;
import org.apache.hivemind.schema.AttributeModel;
Modified: hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/ConfigurationPointDescriptor.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/ConfigurationPointDescriptor.java?view=diff&rev=470376&r1=470375&r2=470376
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/ConfigurationPointDescriptor.java (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/ConfigurationPointDescriptor.java Thu Nov 2 06:36:20 2006
@@ -15,7 +15,7 @@
package org.apache.hivemind.parse;
import org.apache.hivemind.Occurances;
-import org.apache.hivemind.internal.Visibility;
+import org.apache.hivemind.definition.Visibility;
import org.apache.hivemind.schema.impl.SchemaImpl;
import org.apache.hivemind.util.ToStringBuilder;
Modified: hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/DescriptorParser.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/DescriptorParser.java?view=diff&rev=470376&r1=470375&r2=470376
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/DescriptorParser.java (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/DescriptorParser.java Thu Nov 2 06:36:20 2006
@@ -32,9 +32,9 @@
import org.apache.hivemind.ErrorHandler;
import org.apache.hivemind.Occurances;
import org.apache.hivemind.Resource;
+import org.apache.hivemind.definition.Visibility;
import org.apache.hivemind.impl.AttributeImpl;
import org.apache.hivemind.impl.ElementImpl;
-import org.apache.hivemind.internal.Visibility;
import org.apache.hivemind.schema.ElementModel;
import org.apache.hivemind.schema.Rule;
import org.apache.hivemind.schema.impl.AttributeModelImpl;
Modified: hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/ServicePointDescriptor.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/ServicePointDescriptor.java?view=diff&rev=470376&r1=470375&r2=470376
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/ServicePointDescriptor.java (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/ServicePointDescriptor.java Thu Nov 2 06:36:20 2006
@@ -15,7 +15,7 @@
package org.apache.hivemind.parse;
import org.apache.hivemind.Occurances;
-import org.apache.hivemind.internal.Visibility;
+import org.apache.hivemind.definition.Visibility;
import org.apache.hivemind.schema.impl.SchemaImpl;
import org.apache.hivemind.util.ToStringBuilder;
Modified: hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/schema/impl/SchemaImpl.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/schema/impl/SchemaImpl.java?view=diff&rev=470376&r1=470375&r2=470376
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/schema/impl/SchemaImpl.java (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/schema/impl/SchemaImpl.java Thu Nov 2 06:36:20 2006
@@ -21,7 +21,7 @@
import java.util.List;
import org.apache.hivemind.ApplicationRuntimeException;
-import org.apache.hivemind.internal.Visibility;
+import org.apache.hivemind.definition.Visibility;
import org.apache.hivemind.parse.BaseAnnotationHolder;
import org.apache.hivemind.schema.AttributeModel;
import org.apache.hivemind.schema.ElementModel;
Modified: hivemind/branches/branch-2-0-annot/xml/src/test/hivemind/test/parse/TestDescriptorParser.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/test/hivemind/test/parse/TestDescriptorParser.java?view=diff&rev=470376&r1=470375&r2=470376
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/test/hivemind/test/parse/TestDescriptorParser.java (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/test/hivemind/test/parse/TestDescriptorParser.java Thu Nov 2 06:36:20 2006
@@ -25,8 +25,8 @@
import org.apache.hivemind.Element;
import org.apache.hivemind.Occurances;
import org.apache.hivemind.Resource;
+import org.apache.hivemind.definition.Visibility;
import org.apache.hivemind.impl.DefaultErrorHandler;
-import org.apache.hivemind.internal.Visibility;
import org.apache.hivemind.parse.ConfigurationPointDescriptor;
import org.apache.hivemind.parse.ContributionDescriptor;
import org.apache.hivemind.parse.CreateInstanceDescriptor;
Modified: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/impl/TestXmlModuleDescriptorProcessor.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/impl/TestXmlModuleDescriptorProcessor.java?view=diff&rev=470376&r1=470375&r2=470376
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/impl/TestXmlModuleDescriptorProcessor.java (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/impl/TestXmlModuleDescriptorProcessor.java Thu Nov 2 06:36:20 2006
@@ -23,8 +23,8 @@
import org.apache.hivemind.Location;
import org.apache.hivemind.definition.ConfigurationPointDefinition;
import org.apache.hivemind.definition.RegistryDefinition;
+import org.apache.hivemind.definition.Visibility;
import org.apache.hivemind.impl.natures.XmlConfigurationPointNature;
-import org.apache.hivemind.internal.Visibility;
import org.apache.hivemind.parse.ConfigurationPointDescriptor;
import org.apache.hivemind.parse.ContributionDescriptor;
import org.apache.hivemind.parse.ModuleDescriptor;