ow-nuxeo 0.2.0 → 0.2.1

data/archetype/src/main/resources/archetype-resources/__rootArtifactId__-core/pom.xml

@@ -7,7 +7,6 @@
     <version>${version}</version>
     <relativePath>..</relativePath>
   </parent>
-  <groupId>${groupId}</groupId>
   <artifactId>${artifactId}</artifactId>
   <name>${name} : Core</name>
   <packaging>jar</packaging>

data/archetype/src/main/resources/archetype-resources/__rootArtifactId__-core/src/main/resources/OSGI-INF/version-display-contrib.xml

@@ -1,9 +1,9 @@
-<component name="${moduleId}.core.version">
+<component name="${nuxeoModuleId}.core.version">
 
   <extension target="fr.openwide.commons.utils.jsf.VersionDisplayService" point="config">
     <config>
       <versionNumberPrefix>${name} v</versionNumberPrefix>
-      <bundleMatchRegexp>${artifactId}-.*</bundleMatchRegexp>
+      <bundleMatchRegexp>${rootArtifactId}-.*</bundleMatchRegexp>
     </config>
   </extension>
 

data/archetype/src/main/resources/archetype-resources/__rootArtifactId__-distribution/pom.xml

@@ -7,7 +7,6 @@
     <version>${version}</version>
     <relativePath>..</relativePath>
   </parent>
-  <groupId>${groupId}</groupId>
   <artifactId>${artifactId}</artifactId>
   <name>${name} : Marketplace distribution</name>
   <packaging>zip</packaging>

data/archetype/src/main/resources/archetype-resources/__rootArtifactId__-distribution/src/main/resources/install/templates/__rootArtifactId__-default/nuxeo.defaults

@@ -1,4 +1,4 @@
-## DO NOT EDIT THIS FILE, COPY /templates/${artifactId}-default TO /template/${artifactId} AND ENABLE THE ${artifactId} TEMPLATE ##
+# DO NOT EDIT THIS FILE, COPY /templates/${rootArtifactId}-default TO /template/${rootArtifactId} AND ENABLE THE ${rootArtifactId} TEMPLATE
 
 org.nuxeo.ecm.product.name=${name}
 org.nuxeo.ecm.instance.description=${name}

data/archetype/src/main/resources/archetype-resources/__rootArtifactId__-distribution/src/main/resources/package.xml

@@ -1,5 +1,5 @@
 <!-- See documentation at http://doc.nuxeo.com/x/HgIz -->
-<package type="addon" name="${artifactId}" version="@VERSION@">
+<package type="addon" name="${rootArtifactId}" version="@VERSION@">
   <title>${name}</title>
   <vendor>${vendor}</vendor>
 
@@ -8,12 +8,26 @@
   <nuxeo-validation>none</nuxeo-validation>
   <production-state>testing</production-state>
   <supported>false</supported>
+  
+  #set($nuxeoVersionWithoutHotfix = $nuxeoVersion.split('-').get(0))
   <platforms>
-    <platform>cap</platform>
+    #if($nuxeoVersion.indexOf('5.6') == 0)
+    <platform>cap-5.6</platform>
+    #elseif($nuxeoVersion.indexOf('5.5') == 0)
+    <platform>cap-5.5</platform>
+    #else
+    <platform>cap-${nuxeoVersionWithoutHotfix}</platform>
+    #end
   </platforms>
   <dependencies>
     <dependencies>
-      <package>nuxeo-dm</package>
+      #if($nuxeoVersion.indexOf('5.6') == 0)
+      <package>nuxeo-dm-5.6.0</package>
+      #elseif($nuxeoVersion.indexOf('5.5') == 0)
+      <package>nuxeo-dm-5.5.0</package>
+      #else
+      <package>nuxeo-dm-${nuxeoVersionWithoutHotfix}</package>
+      #end
     </dependencies>
   </dependencies>
 </package>

data/archetype/src/main/resources/archetype-resources/__rootArtifactId__-web/pom.xml

@@ -7,7 +7,6 @@
     <version>${version}</version>
     <relativePath>..</relativePath>
   </parent>
-  <groupId>${groupId}</groupId>
   <artifactId>${artifactId}</artifactId>
   <name>${name} : Web</name>
   <packaging>jar</packaging>

data/archetype/src/main/resources/archetype-resources/pom.xml

@@ -21,11 +21,11 @@
   </developers>
 
   <properties>
-    <${groupId}.version>${project.version}</${groupId}.version>#if($hasStudioProject != 'false')
-    <${groupId}.studio.version>0.0.0-SNAPSHOT</${groupId}.studio.version>#end
+    <${nuxeoModuleId}.version>${project.version}</${nuxeoModuleId}.version>#if($hasStudioProject != 'false')
+    <${nuxeoModuleId}.studio.version>0.0.0-SNAPSHOT</${nuxeoModuleId}.studio.version>#end
     <nuxeo.version>${nuxeoVersion}</nuxeo.version>
     <nuxeo.distribution.tools.version>1.11.5</nuxeo.distribution.tools.version>
-    <openwide.nuxeo.commons.version>0.1.2</openwide.nuxeo.commons.version>
+    <fr.openwide.nuxeo.commons.version>0.1.2</fr.openwide.nuxeo.commons.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   #if($hasStudioProject != 'false')
@@ -125,35 +125,35 @@
       <dependency>
         <groupId>${studioProjectGroupId}</groupId>
         <artifactId>${studioProjectArtifactId}</artifactId>
-        <version>${${groupId}.studio.version}</version>
+        <version>${${nuxeoModuleId}.studio.version}</version>
       </dependency>
       
       #end<dependency>
         <groupId>${groupId}</groupId>
         <artifactId>${artifactId}-core</artifactId>
-        <version>${${groupId}.version}</version>
+        <version>${${nuxeoModuleId}.version}</version>
       </dependency>
       <dependency>
         <groupId>${groupId}</groupId>
         <artifactId>${artifactId}-web</artifactId>
-        <version>${${groupId}.version}</version>
+        <version>${${nuxeoModuleId}.version}</version>
       </dependency>
       
       <!-- Open Wide commons -->
       <dependency>
         <groupId>fr.openwide.nuxeo.commons</groupId>
         <artifactId>openwide-nuxeo-constants</artifactId>
-        <version>${openwide.nuxeo.commons.version}</version>
+        <version>${fr.openwide.nuxeo.commons.version}</version>
       </dependency>
       <dependency>
         <groupId>fr.openwide.nuxeo.commons</groupId>
         <artifactId>openwide-nuxeo-utils</artifactId>
-        <version>${openwide.nuxeo.commons.version}</version>
+        <version>${fr.openwide.nuxeo.commons.version}</version>
       </dependency>
       <dependency>
         <groupId>fr.openwide.nuxeo.commons</groupId>
         <artifactId>openwide-nuxeo-tests-helper</artifactId>
-        <version>${openwide.nuxeo.commons.version}</version>
+        <version>${fr.openwide.nuxeo.commons.version}</version>
         <scope>test</scope>
       </dependency>
     </dependencies>

data/bin/ow-nuxeo

@@ -144,6 +144,10 @@ ARGV.each do |arg|
       
       puts "\n[2/3] NUXEO INFORMATION"
       puts "======================="
+      while projectInfo['nuxeoVersion'].to_s == ''
+        print "Target Nuxeo version (example: '5.6') >> "
+        projectInfo['nuxeoVersion'] = STDIN.gets.strip
+      end
       defaultModuleId = projectInfo['groupId'] + '.' + projectInfo['artifactId']
       print "[OPTIONAL] Module ID (default is '" + defaultModuleId + "') >> "
       projectInfo['nuxeoModuleId'] = STDIN.gets.strip
@@ -218,7 +222,7 @@ ARGV.each do |arg|
           puts key + "=" + value.to_s
         end
         puts "------------"
-        print ">> "
+        print "(press ENTER or set a variable) >> "
         confirm = STDIN.gets.strip
         if confirm.to_s != ''
           kv = confirm.split(' ')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ow-nuxeo
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2013-08-02 00:00:00.000000000 Z
 dependencies: []
 description: Eases common tasks with Nuxeo projects, from instanciating a client project
   to building and launching it.