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/17 16:17:12 UTC

svn commit: r476172 - in /hivemind/branches/branch-2-0-annot: annotations/src/java/org/apache/hivemind/annotations/internal/ framework/src/java/org/apache/hivemind/ framework/src/java/org/apache/hivemind/definition/ framework/src/java/org/apache/hivemi...

Author: ahuegen
Date: Fri Nov 17 07:17:10 2006
New Revision: 476172

URL: http://svn.apache.org/viewvc?view=rev&rev=476172
Log:
Moved Occurances to definition package

Added:
    hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/Occurances.java   (contents, props changed)
      - copied, changed from r476169, hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/Occurances.java
Removed:
    hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/Occurances.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/DefinitionMessages.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/impl/ConfigurationPointDefinitionImpl.java
    hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/ConfigurationPointImpl.java
    hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/RegistryBuilder.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/TestOccurances.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/impl/InvokeFactoryServiceConstructor.java
    hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlImplMessages.java
    hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlServicePointDefinitionImpl.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/test/hivemind/test/parse/TestDescriptorParser.java
    hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/impl/TestInvokeFactoryServiceConstructor.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=476172&r1=476171&r2=476172
==============================================================================
--- 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 Fri Nov 17 07:17:10 2006
@@ -8,13 +8,13 @@
 import org.apache.hivemind.ClassResolver;
 import org.apache.hivemind.ErrorHandler;
 import org.apache.hivemind.Location;
-import org.apache.hivemind.Occurances;
 import org.apache.hivemind.Resource;
 import org.apache.hivemind.annotations.Configuration;
 import org.apache.hivemind.annotations.Contribution;
 import org.apache.hivemind.annotations.Module;
 import org.apache.hivemind.annotations.Service;
 import org.apache.hivemind.definition.ModuleDefinition;
+import org.apache.hivemind.definition.Occurances;
 import org.apache.hivemind.definition.RegistryDefinition;
 import org.apache.hivemind.definition.ServiceImplementationDefinition;
 import org.apache.hivemind.definition.Visibility;

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=476172&r1=476171&r2=476172
==============================================================================
--- 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 Fri Nov 17 07:17:10 2006
@@ -2,7 +2,6 @@
 
 import java.util.List;
 
-import org.apache.hivemind.Occurances;
 import org.apache.hivemind.definition.construction.ConfigurationConstructor;
 
 public interface ConfigurationPointDefinition extends ExtensionPointDefinition

Modified: hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/DefinitionMessages.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/DefinitionMessages.java?view=diff&rev=476172&r1=476171&r2=476172
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/DefinitionMessages.java (original)
+++ hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/DefinitionMessages.java Fri Nov 17 07:17:10 2006
@@ -14,7 +14,6 @@
 
 package org.apache.hivemind.definition;
 
-import org.apache.hivemind.Occurances;
 import org.apache.hivemind.impl.MessageFormatter;
 import org.apache.hivemind.util.IdUtils;
 

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=476172&r1=476171&r2=476172
==============================================================================
--- 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 Fri Nov 17 07:17:10 2006
@@ -1,6 +1,5 @@
 package org.apache.hivemind.definition;
 
-import org.apache.hivemind.Occurances;
 import org.apache.hivemind.definition.construction.ConfigurationConstructor;
 import org.apache.hivemind.definition.construction.ContributionConstructor;
 import org.apache.hivemind.definition.construction.ImplementationConstructor;

Copied: hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/Occurances.java (from r476169, hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/Occurances.java)
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/Occurances.java?view=diff&rev=476172&p1=hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/Occurances.java&r1=476169&p2=hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/Occurances.java&r2=476172
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/Occurances.java (original)
+++ hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/Occurances.java Fri Nov 17 07:17:10 2006
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.hivemind;
+package org.apache.hivemind.definition;
 
 /**
  * Identifies the number of contributions allowed to a configuration extension point.

Propchange: hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/Occurances.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.6

Propchange: hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/Occurances.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/Occurances.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/impl/ConfigurationPointDefinitionImpl.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/impl/ConfigurationPointDefinitionImpl.java?view=diff&rev=476172&r1=476171&r2=476172
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/impl/ConfigurationPointDefinitionImpl.java (original)
+++ hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/impl/ConfigurationPointDefinitionImpl.java Fri Nov 17 07:17:10 2006
@@ -4,10 +4,10 @@
 import java.util.List;
 
 import org.apache.hivemind.Location;
-import org.apache.hivemind.Occurances;
 import org.apache.hivemind.definition.ConfigurationPointDefinition;
 import org.apache.hivemind.definition.ContributionDefinition;
 import org.apache.hivemind.definition.ModuleDefinition;
+import org.apache.hivemind.definition.Occurances;
 import org.apache.hivemind.definition.Visibility;
 import org.apache.hivemind.definition.construction.ConfigurationConstructor;
 
@@ -77,7 +77,7 @@
     }
 
     /**
-     * @see org.apache.hivemind.definition.ConfigurationPointDefinition#setExpectedContributions(org.apache.hivemind.Occurances)
+     * @see org.apache.hivemind.definition.ConfigurationPointDefinition#setExpectedContributions(org.apache.hivemind.definition.Occurances)
      */
     public void setExpectedContributions(Occurances expectedContributions)
     {

Modified: hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/ConfigurationPointImpl.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/ConfigurationPointImpl.java?view=diff&rev=476172&r1=476171&r2=476172
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/ConfigurationPointImpl.java (original)
+++ hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/ConfigurationPointImpl.java Fri Nov 17 07:17:10 2006
@@ -24,10 +24,10 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.hivemind.ApplicationRuntimeException;
 import org.apache.hivemind.HiveMind;
-import org.apache.hivemind.Occurances;
 import org.apache.hivemind.ShutdownCoordinator;
 import org.apache.hivemind.definition.ConfigurationPointDefinition;
 import org.apache.hivemind.definition.ContributionDefinition;
+import org.apache.hivemind.definition.Occurances;
 import org.apache.hivemind.definition.construction.ConfigurationConstructionContext;
 import org.apache.hivemind.definition.construction.ConfigurationConstructor;
 import org.apache.hivemind.definition.construction.ContributionConstructionContext;

Modified: hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/RegistryBuilder.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/RegistryBuilder.java?view=diff&rev=476172&r1=476171&r2=476172
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/RegistryBuilder.java (original)
+++ hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/RegistryBuilder.java Fri Nov 17 07:17:10 2006
@@ -21,11 +21,11 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hivemind.ErrorHandler;
-import org.apache.hivemind.Occurances;
 import org.apache.hivemind.Registry;
 import org.apache.hivemind.definition.ConfigurationPointDefinition;
 import org.apache.hivemind.definition.DefinitionMessages;
 import org.apache.hivemind.definition.ModuleDefinition;
+import org.apache.hivemind.definition.Occurances;
 import org.apache.hivemind.definition.RegistryDefinition;
 import org.apache.hivemind.events.RegistryInitializationListener;
 import org.apache.hivemind.internal.RegistryInfrastructure;

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=476172&r1=476171&r2=476172
==============================================================================
--- 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 Fri Nov 17 07:17:10 2006
@@ -18,9 +18,9 @@
 import java.util.ArrayList;
 
 import org.apache.hivemind.ClassResolver;
-import org.apache.hivemind.Occurances;
 import org.apache.hivemind.definition.ConfigurationPointDefinition;
 import org.apache.hivemind.definition.ModuleDefinition;
+import org.apache.hivemind.definition.Occurances;
 import org.apache.hivemind.definition.ServiceImplementationDefinition;
 import org.apache.hivemind.definition.Visibility;
 import org.apache.hivemind.definition.impl.ConfigurationPointDefinitionImpl;

Modified: hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/TestOccurances.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/TestOccurances.java?view=diff&rev=476172&r1=476171&r2=476172
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/TestOccurances.java (original)
+++ hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/TestOccurances.java Fri Nov 17 07:17:10 2006
@@ -14,10 +14,12 @@
 
 package org.apache.hivemind;
 
+import org.apache.hivemind.definition.Occurances;
+
 import junit.framework.TestCase;
 
 /**
- * Tests {@link org.apache.hivemind.Occurances#inRange(int)} for different
+ * Tests {@link org.apache.hivemind.definition.Occurances#inRange(int)} for different
  * types of occurances.
  *
  * @author Howard Lewis Ship

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=476172&r1=476171&r2=476172
==============================================================================
--- 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 Fri Nov 17 07:17:10 2006
@@ -27,10 +27,10 @@
 import org.apache.hivemind.ApplicationRuntimeException;
 import org.apache.hivemind.Attribute;
 import org.apache.hivemind.ErrorHandler;
-import org.apache.hivemind.Occurances;
 import org.apache.hivemind.definition.ConfigurationPointDefinition;
 import org.apache.hivemind.definition.ContributionDefinition;
 import org.apache.hivemind.definition.ModuleDefinition;
+import org.apache.hivemind.definition.Occurances;
 import org.apache.hivemind.definition.RegistryDefinition;
 import org.apache.hivemind.definition.ServiceImplementationDefinition;
 import org.apache.hivemind.definition.ServiceInterceptorDefinition;

Modified: hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/InvokeFactoryServiceConstructor.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/InvokeFactoryServiceConstructor.java?view=diff&rev=476172&r1=476171&r2=476172
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/InvokeFactoryServiceConstructor.java (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/InvokeFactoryServiceConstructor.java Fri Nov 17 07:17:10 2006
@@ -19,9 +19,9 @@
 import org.apache.hivemind.ApplicationRuntimeException;
 import org.apache.hivemind.ErrorLog;
 import org.apache.hivemind.Location;
-import org.apache.hivemind.Occurances;
 import org.apache.hivemind.ServiceImplementationFactory;
 import org.apache.hivemind.ServiceImplementationFactoryParameters;
+import org.apache.hivemind.definition.Occurances;
 import org.apache.hivemind.definition.ServicePointDefinition;
 import org.apache.hivemind.definition.construction.ImplementationConstructionContext;
 import org.apache.hivemind.internal.AbstractServiceImplementationConstructor;

Modified: hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlImplMessages.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlImplMessages.java?view=diff&rev=476172&r1=476171&r2=476172
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlImplMessages.java (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlImplMessages.java Fri Nov 17 07:17:10 2006
@@ -18,8 +18,8 @@
 import org.apache.hivemind.Element;
 import org.apache.hivemind.HiveMind;
 import org.apache.hivemind.Location;
-import org.apache.hivemind.Occurances;
 import org.apache.hivemind.Resource;
+import org.apache.hivemind.definition.Occurances;
 import org.apache.hivemind.schema.SchemaProcessor;
 
 

Modified: hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlServicePointDefinitionImpl.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlServicePointDefinitionImpl.java?view=diff&rev=476172&r1=476171&r2=476172
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlServicePointDefinitionImpl.java (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlServicePointDefinitionImpl.java Fri Nov 17 07:17:10 2006
@@ -1,8 +1,8 @@
 package org.apache.hivemind.impl;
 
 import org.apache.hivemind.Location;
-import org.apache.hivemind.Occurances;
 import org.apache.hivemind.definition.ModuleDefinition;
+import org.apache.hivemind.definition.Occurances;
 import org.apache.hivemind.definition.Visibility;
 import org.apache.hivemind.definition.impl.ServicePointDefinitionImpl;
 import org.apache.hivemind.schema.Schema;

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=476172&r1=476171&r2=476172
==============================================================================
--- 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 Fri Nov 17 07:17:10 2006
@@ -14,7 +14,7 @@
 
 package org.apache.hivemind.parse;
 
-import org.apache.hivemind.Occurances;
+import org.apache.hivemind.definition.Occurances;
 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=476172&r1=476171&r2=476172
==============================================================================
--- 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 Fri Nov 17 07:17:10 2006
@@ -30,8 +30,8 @@
 import org.apache.hivemind.Attribute;
 import org.apache.hivemind.ClassResolver;
 import org.apache.hivemind.ErrorHandler;
-import org.apache.hivemind.Occurances;
 import org.apache.hivemind.Resource;
+import org.apache.hivemind.definition.Occurances;
 import org.apache.hivemind.definition.Visibility;
 import org.apache.hivemind.impl.AttributeImpl;
 import org.apache.hivemind.impl.ElementImpl;

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=476172&r1=476171&r2=476172
==============================================================================
--- 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 Fri Nov 17 07:17:10 2006
@@ -14,7 +14,7 @@
 
 package org.apache.hivemind.parse;
 
-import org.apache.hivemind.Occurances;
+import org.apache.hivemind.definition.Occurances;
 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/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=476172&r1=476171&r2=476172
==============================================================================
--- 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 Fri Nov 17 07:17:10 2006
@@ -23,8 +23,8 @@
 import org.apache.hivemind.ApplicationRuntimeException;
 import org.apache.hivemind.Attribute;
 import org.apache.hivemind.Element;
-import org.apache.hivemind.Occurances;
 import org.apache.hivemind.Resource;
+import org.apache.hivemind.definition.Occurances;
 import org.apache.hivemind.definition.Visibility;
 import org.apache.hivemind.impl.DefaultErrorHandler;
 import org.apache.hivemind.parse.ConfigurationPointDescriptor;

Modified: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/impl/TestInvokeFactoryServiceConstructor.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/impl/TestInvokeFactoryServiceConstructor.java?view=diff&rev=476172&r1=476171&r2=476172
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/impl/TestInvokeFactoryServiceConstructor.java (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/impl/TestInvokeFactoryServiceConstructor.java Fri Nov 17 07:17:10 2006
@@ -22,10 +22,10 @@
 
 import org.apache.hivemind.ErrorLog;
 import org.apache.hivemind.Location;
-import org.apache.hivemind.Occurances;
 import org.apache.hivemind.Registry;
 import org.apache.hivemind.ServiceImplementationFactory;
 import org.apache.hivemind.definition.ModuleDefinition;
+import org.apache.hivemind.definition.Occurances;
 import org.apache.hivemind.definition.construction.ImplementationConstructionContext;
 import org.apache.hivemind.internal.ImplementationConstructionContextImpl;
 import org.apache.hivemind.internal.Module;