Author: [email protected]
Date: Wed Sep  7 11:33:51 2011
New Revision: 1352

Log:
AMDATU-399 Refactorred after split off of the ace client

Added:
   sandbox/bdekruijff/amdatu-maven-plugin/LICENSE
   sandbox/bdekruijff/amdatu-maven-plugin/NOTICE
   sandbox/bdekruijff/amdatu-maven-plugin/README
   sandbox/bdekruijff/amdatu-maven-plugin/src/main/java/org/amdatu/maven/plugin/
   
sandbox/bdekruijff/amdatu-maven-plugin/src/main/java/org/amdatu/maven/plugin/ClassHeadersMojo.java
      - copied, changed from r1351, 
/sandbox/bdekruijff/amdatu-maven-plugin/src/main/java/org/amdatu/maven/ClassHeadersMojo.java
   
sandbox/bdekruijff/amdatu-maven-plugin/src/main/java/org/amdatu/maven/plugin/DeployBundleMojo.java
      - copied, changed from r1351, 
/sandbox/bdekruijff/amdatu-maven-plugin/src/main/java/org/amdatu/maven/DeployBundleMojo.java
   
sandbox/bdekruijff/amdatu-maven-plugin/src/main/java/org/amdatu/maven/plugin/ExportModelMojo.java
      - copied, changed from r1351, 
/sandbox/bdekruijff/amdatu-maven-plugin/src/main/java/org/amdatu/maven/ExportModelMojo.java
   
sandbox/bdekruijff/amdatu-maven-plugin/src/main/java/org/amdatu/maven/plugin/ImportModelMojo.java
      - copied, changed from r1351, 
/sandbox/bdekruijff/amdatu-maven-plugin/src/main/java/org/amdatu/maven/ImportModelMojo.java
   
sandbox/bdekruijff/amdatu-maven-plugin/src/main/resources/Apache-License-2.0.header
      - copied unchanged from r1351, 
/sandbox/bdekruijff/amdatu-maven-plugin/src/main/resources/classheader.txt
Removed:
   
sandbox/bdekruijff/amdatu-maven-plugin/src/main/java/org/amdatu/maven/ClassHeadersMojo.java
   
sandbox/bdekruijff/amdatu-maven-plugin/src/main/java/org/amdatu/maven/DeployBundleMojo.java
   
sandbox/bdekruijff/amdatu-maven-plugin/src/main/java/org/amdatu/maven/ExportModelMojo.java
   
sandbox/bdekruijff/amdatu-maven-plugin/src/main/java/org/amdatu/maven/ImportModelMojo.java
   
sandbox/bdekruijff/amdatu-maven-plugin/src/main/java/org/amdatu/maven/ace/AceClient.java
   
sandbox/bdekruijff/amdatu-maven-plugin/src/main/java/org/amdatu/maven/ace/AceClientException.java
   
sandbox/bdekruijff/amdatu-maven-plugin/src/main/java/org/amdatu/maven/ace/AceClientWorkspace.java
   
sandbox/bdekruijff/amdatu-maven-plugin/src/main/java/org/amdatu/maven/ace/model/
   sandbox/bdekruijff/amdatu-maven-plugin/src/main/resources/classheader.txt
Modified:
   sandbox/bdekruijff/amdatu-maven-plugin/pom.xml
   
sandbox/bdekruijff/amdatu-maven-plugin/src/test/java/org/amdatu/maven/MyMojoTest.java

Added: sandbox/bdekruijff/amdatu-maven-plugin/LICENSE
==============================================================================
--- (empty file)
+++ sandbox/bdekruijff/amdatu-maven-plugin/LICENSE      Wed Sep  7 11:33:51 2011
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

Added: sandbox/bdekruijff/amdatu-maven-plugin/NOTICE
==============================================================================
--- (empty file)
+++ sandbox/bdekruijff/amdatu-maven-plugin/NOTICE       Wed Sep  7 11:33:51 2011
@@ -0,0 +1,13 @@
+Amdatu Ace Client
+Copyright 2010, 2011 The Amdatu Foundation
+
+I. Included Software
+
+This product includes software developed at
+The Amdatu Foundation (http://www.amdatu.org/).
+Licensed under the Apache License 2.0.
+
+II. Used Software
+
+III. License Summary
+- Apache License 2.0

Added: sandbox/bdekruijff/amdatu-maven-plugin/README
==============================================================================
--- (empty file)
+++ sandbox/bdekruijff/amdatu-maven-plugin/README       Wed Sep  7 11:33:51 2011
@@ -0,0 +1,13 @@
+Amdatu Maven plugin
+Copyright 2010, 2011 The Amdatu Foundation
+
+This library implements a Maven2 plugin with several mojos used in the Amdatu 
project
+
+Features:
+
+* classheaders mojo supports batch updating java class headers
+
+
+
+Examples:
+

Modified: sandbox/bdekruijff/amdatu-maven-plugin/pom.xml
==============================================================================
--- sandbox/bdekruijff/amdatu-maven-plugin/pom.xml      (original)
+++ sandbox/bdekruijff/amdatu-maven-plugin/pom.xml      Wed Sep  7 11:33:51 2011
@@ -8,7 +8,7 @@
   </parent>
 
   <groupId>org.amdatu.maven</groupId>
-  <artifactId>amdatu-maven-plugin</artifactId>
+  <artifactId>org.amdatu.maven.plugin</artifactId>
   <version>1.0-SNAPSHOT</version>
   <packaging>maven-plugin</packaging>
 
@@ -54,11 +54,11 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>1.7.1</version>
-      <type>jar</type>
-      <scope>compile</scope>
+       <groupId>org.amdatu.ace</groupId>
+       <artifactId>org.amdatu.ace.client</artifactId>
+       <version>0.0.1-SNAPSHOT</version>
+       <type>jar</type>
+       <scope>compile</scope>
     </dependency>
     <dependency>
        <groupId>commons-io</groupId>

Copied: 
sandbox/bdekruijff/amdatu-maven-plugin/src/main/java/org/amdatu/maven/plugin/ClassHeadersMojo.java
 (from r1351, 
/sandbox/bdekruijff/amdatu-maven-plugin/src/main/java/org/amdatu/maven/ClassHeadersMojo.java)
==============================================================================
--- 
/sandbox/bdekruijff/amdatu-maven-plugin/src/main/java/org/amdatu/maven/ClassHeadersMojo.java
        (original)
+++ 
sandbox/bdekruijff/amdatu-maven-plugin/src/main/java/org/amdatu/maven/plugin/ClassHeadersMojo.java
  Wed Sep  7 11:33:51 2011
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.amdatu.maven;
+package org.amdatu.maven.plugin;
 
 import java.io.File;
 import java.io.IOException;
@@ -50,7 +50,7 @@
     public void execute() throws MojoExecutionException {
 
         try {
-            InputStream is = 
ClassHeadersMojo.class.getClassLoader().getResourceAsStream("classheader.txt");
+            InputStream is = 
ClassHeadersMojo.class.getClassLoader().getResourceAsStream("Apache-License-2.0.header");
             StringWriter writer = new StringWriter();
             InputStreamReader reader = new InputStreamReader(is);
             IOUtils.copy(reader, writer);
@@ -84,8 +84,8 @@
 
     private void processDirectory(String headerString, File directory) throws 
MojoExecutionException {
 
-        Collection sourceFiles = FileUtils.listFiles(directory, new String[] { 
"java" }, true);
-        Iterator sourceFilesIterator = sourceFiles.iterator();
+        Collection<File> sourceFiles = FileUtils.listFiles(directory, new 
String[] { "java" }, true);
+        Iterator<File> sourceFilesIterator = sourceFiles.iterator();
 
         getLog().info("Processing " + sourceFiles.size() + " sourcefiles in 
directory " + directory.getAbsolutePath());
 

Copied: 
sandbox/bdekruijff/amdatu-maven-plugin/src/main/java/org/amdatu/maven/plugin/DeployBundleMojo.java
 (from r1351, 
/sandbox/bdekruijff/amdatu-maven-plugin/src/main/java/org/amdatu/maven/DeployBundleMojo.java)
==============================================================================
--- 
/sandbox/bdekruijff/amdatu-maven-plugin/src/main/java/org/amdatu/maven/DeployBundleMojo.java
        (original)
+++ 
sandbox/bdekruijff/amdatu-maven-plugin/src/main/java/org/amdatu/maven/plugin/DeployBundleMojo.java
  Wed Sep  7 11:33:51 2011
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.amdatu.maven;
+package org.amdatu.maven.plugin;
 
 import java.net.MalformedURLException;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.amdatu.maven.ace.AceClient;
-import org.amdatu.maven.ace.AceClientException;
-import org.amdatu.maven.ace.AceClientWorkspace;
-import org.amdatu.maven.ace.model.Artifact;
-import org.amdatu.maven.ace.model.ArtifactBuilder;
+import org.amdatu.ace.client.AceClient;
+import org.amdatu.ace.client.AceClientException;
+import org.amdatu.ace.client.AceClientWorkspace;
+import org.amdatu.ace.client.model.Artifact;
+import org.amdatu.ace.client.model.ArtifactBuilder;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 

Copied: 
sandbox/bdekruijff/amdatu-maven-plugin/src/main/java/org/amdatu/maven/plugin/ExportModelMojo.java
 (from r1351, 
/sandbox/bdekruijff/amdatu-maven-plugin/src/main/java/org/amdatu/maven/ExportModelMojo.java)
==============================================================================
--- 
/sandbox/bdekruijff/amdatu-maven-plugin/src/main/java/org/amdatu/maven/ExportModelMojo.java
 (original)
+++ 
sandbox/bdekruijff/amdatu-maven-plugin/src/main/java/org/amdatu/maven/plugin/ExportModelMojo.java
   Wed Sep  7 11:33:51 2011
@@ -13,15 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.amdatu.maven;
+package org.amdatu.maven.plugin;
 
 import java.io.File;
 import java.io.IOException;
 
-import org.amdatu.maven.ace.AceClient;
-import org.amdatu.maven.ace.AceClientException;
-import org.amdatu.maven.ace.AceClientWorkspace;
-import org.amdatu.maven.ace.model.Model;
+import org.amdatu.ace.client.AceClient;
+import org.amdatu.ace.client.AceClientException;
+import org.amdatu.ace.client.AceClientUtil;
+import org.amdatu.ace.client.AceClientWorkspace;
+import org.amdatu.ace.client.model.Model;
 import org.apache.commons.io.FileUtils;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -67,7 +68,7 @@
             workspace = client.createNewWorkspace();
             Model model = workspace.export();
 
-            FileUtils.writeStringToFile(outputFile, client.toJson(model));
+            FileUtils.writeStringToFile(outputFile, 
AceClientUtil.toJson(model));
             getLog().info("Exported Amdatu provisioning model to " + 
outputFile.getAbsolutePath());
         }
         catch (AceClientException e) {

Copied: 
sandbox/bdekruijff/amdatu-maven-plugin/src/main/java/org/amdatu/maven/plugin/ImportModelMojo.java
 (from r1351, 
/sandbox/bdekruijff/amdatu-maven-plugin/src/main/java/org/amdatu/maven/ImportModelMojo.java)
==============================================================================
--- 
/sandbox/bdekruijff/amdatu-maven-plugin/src/main/java/org/amdatu/maven/ImportModelMojo.java
 (original)
+++ 
sandbox/bdekruijff/amdatu-maven-plugin/src/main/java/org/amdatu/maven/plugin/ImportModelMojo.java
   Wed Sep  7 11:33:51 2011
@@ -13,21 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.amdatu.maven;
+package org.amdatu.maven.plugin;
 
 import java.io.File;
 import java.io.IOException;
 
-import org.amdatu.maven.ace.AceClient;
-import org.amdatu.maven.ace.AceClientException;
-import org.amdatu.maven.ace.AceClientWorkspace;
-import org.amdatu.maven.ace.model.Artifact;
-import org.amdatu.maven.ace.model.Artifact2Feature;
-import org.amdatu.maven.ace.model.Distribution;
-import org.amdatu.maven.ace.model.Distribution2Target;
-import org.amdatu.maven.ace.model.Feature;
-import org.amdatu.maven.ace.model.Feature2Distribution;
-import org.amdatu.maven.ace.model.Model;
+import org.amdatu.ace.client.AceClient;
+import org.amdatu.ace.client.AceClientException;
+import org.amdatu.ace.client.AceClientUtil;
+import org.amdatu.ace.client.AceClientWorkspace;
+import org.amdatu.ace.client.model.Artifact;
+import org.amdatu.ace.client.model.Artifact2Feature;
+import org.amdatu.ace.client.model.Distribution;
+import org.amdatu.ace.client.model.Distribution2Target;
+import org.amdatu.ace.client.model.Feature;
+import org.amdatu.ace.client.model.Feature2Distribution;
+import org.amdatu.ace.client.model.Model;
 import org.apache.commons.io.FileUtils;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -69,14 +70,14 @@
         AceClientWorkspace workspace = null;
         try {
             String json = FileUtils.readFileToString(inputFile);
-            Model model = client.fromJson(json, Model.class);
+            Model model = AceClientUtil.fromJson(json, Model.class);
 
             workspace = client.createNewWorkspace();
-            if(override){
+            if (override) {
                 workspace.deleteResources(Artifact.class);
                 workspace.deleteResources(Feature.class);
                 workspace.deleteResources(Distribution.class);
-//                w.deleteResources(Target.class);
+                // w.deleteResources(Target.class);
                 workspace.deleteResources(Artifact2Feature.class);
                 workspace.deleteResources(Feature2Distribution.class);
                 workspace.deleteResources(Distribution2Target.class);

Modified: 
sandbox/bdekruijff/amdatu-maven-plugin/src/test/java/org/amdatu/maven/MyMojoTest.java
==============================================================================
--- 
sandbox/bdekruijff/amdatu-maven-plugin/src/test/java/org/amdatu/maven/MyMojoTest.java
       (original)
+++ 
sandbox/bdekruijff/amdatu-maven-plugin/src/test/java/org/amdatu/maven/MyMojoTest.java
       Wed Sep  7 11:33:51 2011
@@ -15,179 +15,14 @@
  */
 package org.amdatu.maven;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.StringWriter;
+import junit.framework.Assert;
 
-import org.amdatu.maven.ace.AceClient;
-import org.amdatu.maven.ace.AceClientException;
-import org.amdatu.maven.ace.AceClientWorkspace;
-import org.amdatu.maven.ace.model.Artifact;
-import org.amdatu.maven.ace.model.Artifact2Feature;
-import org.amdatu.maven.ace.model.Artifact2FeatureBuilder;
-import org.amdatu.maven.ace.model.ArtifactBuilder;
-import org.amdatu.maven.ace.model.Distribution;
-import org.amdatu.maven.ace.model.Distribution2Target;
-import org.amdatu.maven.ace.model.DistributionBuilder;
-import org.amdatu.maven.ace.model.Feature;
-import org.amdatu.maven.ace.model.Feature2Distribution;
-import org.amdatu.maven.ace.model.Feature2DistributionBuilder;
-import org.amdatu.maven.ace.model.FeatureBuilder;
-import org.amdatu.maven.ace.model.Model;
-import org.apache.commons.io.IOUtils;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class MyMojoTest {
 
-    @Ignore
     @Test
-    public void testImportExport() throws Exception {
-
-        AceClient c = new AceClient("http://localhost:8080/client/work";);
-        AceClientWorkspace w = c.createNewWorkspace();
-        Model m = w.export();
-        w.remove();
-        
-        String s = c.toJson(m);
-        System.err.println(s);
-        
-        Model m2 = c.fromJson(s, Model.class);
-        String s2 = c.toJson(m2);
-        System.err.println(s2);
-    }
-    
-    
-    @Ignore
-    @Test
-    public void testResource() {
-
-        InputStream is = 
ClassHeadersMojo.class.getClassLoader().getResourceAsStream("model.json");
-        try {
-            StringWriter writer = new StringWriter();
-            InputStreamReader reader = new InputStreamReader(is);
-            IOUtils.copy(reader, writer);
-            AceClient c = new AceClient("http://localhost:8080/client/work";);
-            c.fromJson(writer.toString(), Model.class);
-        }
-        catch (IOException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-
-    }
-
-    @Ignore
-    @Test
-    public void deleteAll() throws Exception {
-        AceClient c = new AceClient("http://localhost:8080/client/work";);
-        AceClientWorkspace w = c.createNewWorkspace();
-        w.deleteResources(Artifact.class);
-        w.deleteResources(Feature.class);
-        w.deleteResources(Distribution.class);
-//        w.deleteResources(Target.class);
-        w.deleteResources(Artifact2Feature.class);
-        w.deleteResources(Feature2Distribution.class);
-        w.deleteResources(Distribution2Target.class);
-        w.commit();
-        w.remove();
-    }
-
-    @Ignore
-    @Test
-    public void createFeatures() throws Exception {
-
-        AceClient c = new AceClient("http://localhost:8080/client/work";);
-        AceClientWorkspace w = null;
-        try {
-            w = c.createNewWorkspace();
-
-            Artifact a1 =
-                new ArtifactBuilder()
-                    .isBundle()
-                    .setName("OSGi R42 Compendium")
-                    .setDescription("Compendium interfaces")
-                    .setUrl(
-                        
"http://repo1.maven.org/maven2/org/osgi/org.osgi.compendium/4.2.0/org.osgi.compendium-4.2.0.jar";)
-                    .setProcessorPid("")
-                    .setAttribute("a", "b")
-                    .setBundleName("OSGi R42 Compendium")
-                    .setBundleSymbolicName("osgi.cmpn")
-                    .setBundleVersion("4.2.0.200908310645")
-                    .build();
-
-            Artifact a2 =
-                new ArtifactBuilder()
-                    .isBundle()
-                    .setName("Apache Felix Shell")
-                    .setDescription("shell service")
-                    .setUrl(
-                        
"http://repo1.maven.org/maven2/org/apache/felix/org.apache.felix.shell/1.4.2/org.apache.felix.shell-1.4.2.jar";)
-                    .setProcessorPid("")
-                    .setAttribute("Bundle-Name", "Apache Felix Shell")
-                    .setAttribute("Bundle-SymbolicName", 
"org.apache.felix.shell")
-                    .setAttribute("Bundle-Version", "1.4.2")
-                    .build();
-
-            Artifact a3 =
-                new ArtifactBuilder()
-                    .isBundle()
-                    .setName("Apache Felix Shell TUI")
-                    .setDescription("shell service tui")
-                    .setUrl(
-                        
"http://repo1.maven.org/maven2/org/apache/felix/org.apache.felix.shell.tui/1.4.1/org.apache.felix.shell.tui-1.4.1.jar";)
-                    .setProcessorPid("")
-                    .setAttribute("Bundle-Name", "Apache Felix Shell TUI")
-                    .setAttribute("Bundle-SymbolicName", 
"org.apache.felix.shell.tui")
-                    .setAttribute("Bundle-Version", "1.4.1")
-                    .build();
-
-            Feature coreF =
-                new FeatureBuilder().setName("Amdatu 
Core").setDescription("components and configuration").build();
-            String featureId = w.createResource(coreF);
-
-            Distribution platformD =
-                new DistributionBuilder().setName("Amdatu 
Platform").setDescription("amdatu platform").build();
-            String distributionId = w.createResource(platformD);
-
-// Target developmentT = new Target("ama-2");
-// String targetId = w.createResource(developmentT);
-
-            Feature2Distribution f2d =
-                new 
Feature2DistributionBuilder().setLeftEndpoint(featureId).setRightEndpoint(distributionId).build();
-            w.createResource(f2d);
-// w.createResource(new Distribution2Target(distributionId, targetId));
-
-            String artifact1Id = w.createResource(a1);
-            Artifact2Feature a2f =
-                new 
Artifact2FeatureBuilder().setLeftEndpoint(artifact1Id).setRightEndpoint(featureId).build();
-            w.createResource(a2f);
-
-            String artifact2Id = w.createResource(a2);
-            Artifact2Feature a2f2 =
-                new 
Artifact2FeatureBuilder().setLeftEndpoint(artifact2Id).setRightEndpoint(featureId).build();
-            w.createResource(a2f2);
-
-            String artifact3Id = w.createResource(a3);
-
-            Artifact2Feature a2f3 = new Artifact2FeatureBuilder()
-                                        .setLeftEndpoint(artifact3Id)
-                                        .setRightEndpoint(featureId)
-                                        .build();
-            w.createResource(a2f3);
-
-            w.commit();
-
-        }
-        catch (AceClientException e) {
-            throw new MojoExecutionException(e.getMessage(), e);
-        }
-        finally {
-            if (w != null) {
-                w.remove();
-            }
-        }
+    public void testMe() throws Exception {
+        Assert.assertTrue(true);
     }
 }
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits

Reply via email to