cvs commit: spice/sandbox/repository/componenthaus/src/java/org/componenthaus/usecases/submitcomponent ComponentSubmissionManager.java DefaultCarSubmissionManager.java DefaultComponentSubmissionManager.java MetadataConverterImpl.java

hogie       03/11/09 08:21:39

  Modified:    sandbox/repository/componenthaus/src/java/org/componenthaus/usecases/submitcomponent
                        ComponentSubmissionManager.java
                        DefaultCarSubmissionManager.java
                        DefaultComponentSubmissionManager.java
                        MetadataConverterImpl.java
  Log:
  Can now submit most of plexus-utils
  
  Revision  Changes    Path
  1.2       +3 -1      spice/sandbox/repository/componenthaus/src/java/org/componenthaus/usecases/submitcomponent/ComponentSubmissionManager.java
  
  Index: ComponentSubmissionManager.java
  ===================================================================
  RCS file: /cvsroot/spice/spice/sandbox/repository/componenthaus/src/java/org/componenthaus/usecases/submitcomponent/ComponentSubmissionManager.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ComponentSubmissionManager.java	9 Nov 2003 14:00:49 -0000	1.1
  +++ ComponentSubmissionManager.java	9 Nov 2003 16:21:39 -0000	1.2
  @@ -2,6 +2,8 @@
   
   import org.componenthaus.ant.metadata.ComponentMetadata;
   
  +import java.util.Collection;
  +
   public interface ComponentSubmissionManager {
  -    void submit(ComponentMetadata componentMetadata) throws ComponentSubmissionException;
  +    Collection submit(ComponentMetadata componentMetadata) throws ComponentSubmissionException;
   }
  
  
  
  1.2       +5 -6      spice/sandbox/repository/componenthaus/src/java/org/componenthaus/usecases/submitcomponent/DefaultCarSubmissionManager.java
  
  Index: DefaultCarSubmissionManager.java
  ===================================================================
  RCS file: /cvsroot/spice/spice/sandbox/repository/componenthaus/src/java/org/componenthaus/usecases/submitcomponent/DefaultCarSubmissionManager.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultCarSubmissionManager.java	9 Nov 2003 14:00:49 -0000	1.1
  +++ DefaultCarSubmissionManager.java	9 Nov 2003 16:21:39 -0000	1.2
  @@ -2,7 +2,6 @@
   
   import org.componenthaus.ant.metadata.ComponentMetadata;
   import org.componenthaus.repository.api.Component;
  -import org.componenthaus.repository.impl.ComponentFactory;
   import org.componenthaus.repository.services.CommandRegistry;
   import org.componenthaus.util.file.FileManager;
   import org.prevayler.Prevayler;
  @@ -23,18 +22,18 @@
       private final Prevayler prevayler;
       private final FileManager fileManager;
       private final SubmissionMonitor submissionMonitor;
  -    private final MetadataConverter metadataConverter;
  +    private final ComponentSubmissionManager componentSubmissionManager;
   
       public DefaultCarSubmissionManager(CommandRegistry commandRegistry,
                                       FileManager fileManager,
                                       SubmissionMonitor submissionMonitor,
                                       Prevayler prevayler,
  -                                    MetadataConverter metadataConverter) {
  +                                    ComponentSubmissionManager componentSubmissionManager) {
           this.commandRegistry = commandRegistry;
           this.prevayler = prevayler;
           this.fileManager = fileManager;
           this.submissionMonitor = submissionMonitor;
  -        this.metadataConverter = metadataConverter;
  +        this.componentSubmissionManager = componentSubmissionManager;
       }
   
       public void submit(File filename) throws Exception {
  @@ -50,7 +49,7 @@
           }
           System.out.println("About to handle metadata");
           Collection components = handleMetadata(jarFile, metadataFile);
  -        System.out.println("Meta data done");
  +        System.out.println("Meta data done, " + components.size() + " components added");
           File jarInRepository = handleDistribution(jarFile,distribution);
           for(Iterator i=components.iterator();i.hasNext();) {
               Component component = (Component) i.next();
  @@ -89,7 +88,7 @@
   
           final String metadata = new String(bytes);
           final ComponentMetadata componentMetadata = ComponentMetadata.fromXml(metadata);
  -        return metadataConverter.convert(componentMetadata);
  +        return componentSubmissionManager.submit(componentMetadata);
       }
   
       private ZipEntry getDistributionEntry(JarFile jarFile) {
  
  
  
  1.2       +2 -1      spice/sandbox/repository/componenthaus/src/java/org/componenthaus/usecases/submitcomponent/DefaultComponentSubmissionManager.java
  
  Index: DefaultComponentSubmissionManager.java
  ===================================================================
  RCS file: /cvsroot/spice/spice/sandbox/repository/componenthaus/src/java/org/componenthaus/usecases/submitcomponent/DefaultComponentSubmissionManager.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultComponentSubmissionManager.java	9 Nov 2003 14:00:49 -0000	1.1
  +++ DefaultComponentSubmissionManager.java	9 Nov 2003 16:21:39 -0000	1.2
  @@ -19,7 +19,7 @@
           this.commandRegistry = commandRegistry;
       }
   
  -    public void submit(ComponentMetadata componentMetadata) throws ComponentSubmissionException {
  +    public Collection submit(ComponentMetadata componentMetadata) throws ComponentSubmissionException {
           if ( componentMetadata == null ) {
               throw new IllegalArgumentException("componentMetadata cannot be null");
           }
  @@ -34,5 +34,6 @@
                   throw new ComponentSubmissionException("Exception submitting component",e);
               }
           }
  +        return components;
       }
   }
  
  
  
  1.2       +1 -1      spice/sandbox/repository/componenthaus/src/java/org/componenthaus/usecases/submitcomponent/MetadataConverterImpl.java
  
  Index: MetadataConverterImpl.java
  ===================================================================
  RCS file: /cvsroot/spice/spice/sandbox/repository/componenthaus/src/java/org/componenthaus/usecases/submitcomponent/MetadataConverterImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MetadataConverterImpl.java	9 Nov 2003 14:00:49 -0000	1.1
  +++ MetadataConverterImpl.java	9 Nov 2003 16:21:39 -0000	1.2
  @@ -46,7 +46,7 @@
               JavaDocBuilder builder = new JavaDocBuilder();
               builder.addSource(new StringReader(interfaceMetadata.getSource()));
               JavaClass aClass = builder.getClassByName(interfaceMetadata.getFullyQualifiedName());
  -            assert aClass != null;
  +            assert aClass != null : interfaceMetadata.getFullyQualifiedName();
               System.out.println("Class = " + aClass);
               classAbbreviator.abbreviate(aClass, result);
               source = result.toString();
  
  
  


-------------------------------------------------------
This SF.Net email sponsored by: ApacheCon 2003,
16-19 November in Las Vegas. Learn firsthand the latest
developments in Apache, PHP, Perl, XML, Java, MySQL,
WebDAV, and more! http://www.apachecon.com/