svn commit: r474943 - in /jakarta/commons/proper/digester/trunk: pom.xml src/assembly/ src/assembly/bin.xml src/assembly/src.xml

classic Classic list List threaded Threaded
6 messages Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r474943 - in /jakarta/commons/proper/digester/trunk: pom.xml src/assembly/ src/assembly/bin.xml src/assembly/src.xml

Rahul Akolkar-3
Author: rahul
Date: Tue Nov 14 11:57:14 2006
New Revision: 474943

URL: http://svn.apache.org/viewvc?view=rev&rev=474943
Log:
Add assembly descriptors for distros, TODOs in bin.xml.

Added:
    jakarta/commons/proper/digester/trunk/src/assembly/
    jakarta/commons/proper/digester/trunk/src/assembly/bin.xml   (with props)
    jakarta/commons/proper/digester/trunk/src/assembly/src.xml   (with props)
Modified:
    jakarta/commons/proper/digester/trunk/pom.xml

Modified: jakarta/commons/proper/digester/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/digester/trunk/pom.xml?view=diff&rev=474943&r1=474942&r2=474943
==============================================================================
--- jakarta/commons/proper/digester/trunk/pom.xml (original)
+++ jakarta/commons/proper/digester/trunk/pom.xml Tue Nov 14 11:57:14 2006
@@ -238,8 +238,8 @@
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
           <descriptors>
-            <descriptor>src/main/assembly/bin.xml</descriptor>
-            <descriptor>src/main/assembly/src.xml</descriptor>
+            <descriptor>src/assembly/bin.xml</descriptor>
+            <descriptor>src/assembly/src.xml</descriptor>
           </descriptors>
           <tarLongFileMode>gnu</tarLongFileMode>
         </configuration>

Added: jakarta/commons/proper/digester/trunk/src/assembly/bin.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/digester/trunk/src/assembly/bin.xml?view=auto&rev=474943
==============================================================================
--- jakarta/commons/proper/digester/trunk/src/assembly/bin.xml (added)
+++ jakarta/commons/proper/digester/trunk/src/assembly/bin.xml Tue Nov 14 11:57:14 2006
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You 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.
+-->
+
+<!--
+TODO:
+ 1. Site isn't getting included in binary distro
+    (check includeSiteDirectory usage)
+ 2. Would like binary distros to be *.zip rather than *-bin.zip, for example
+ 3. Make source and binary distros unpack in separate directories
+    (*-src for source distro is conventional in our distros)
+-->
+
+<assembly>
+  <id>bin</id>
+  <formats>
+    <format>tar.gz</format>
+    <format>zip</format>
+  </formats>
+  <includeSiteDirectory/>
+  <fileSets>
+    <fileSet>
+      <includes>
+        <include>README*</include>
+        <include>LICENSE*</include>
+        <include>NOTICE*</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>target</directory>
+      <outputDirectory></outputDirectory>
+      <includes>
+        <include>*.jar</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+</assembly>

Propchange: jakarta/commons/proper/digester/trunk/src/assembly/bin.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/commons/proper/digester/trunk/src/assembly/bin.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: jakarta/commons/proper/digester/trunk/src/assembly/src.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/digester/trunk/src/assembly/src.xml?view=auto&rev=474943
==============================================================================
--- jakarta/commons/proper/digester/trunk/src/assembly/src.xml (added)
+++ jakarta/commons/proper/digester/trunk/src/assembly/src.xml Tue Nov 14 11:57:14 2006
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You 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.
+-->
+<assembly>
+  <id>src</id>
+  <formats>
+    <format>tar.gz</format>
+    <format>zip</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <includes>
+        <include>README*</include>
+        <include>LICENSE*</include>
+        <include>NOTICE*</include>
+        <include>pom.xml</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>src</directory>
+    </fileSet>
+  </fileSets>
+</assembly>
+

Propchange: jakarta/commons/proper/digester/trunk/src/assembly/src.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/commons/proper/digester/trunk/src/assembly/src.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL



---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r474943 - in /jakarta/commons/proper/digester/trunk: pom.xml src/assembly/ src/assembly/bin.xml src/assembly/src.xml

Wendy Smoak
On 11/14/06, [hidden email] <[hidden email]> wrote:

> +TODO:
> + 2. Would like binary distros to be *.zip rather than *-bin.zip, for example
...
> +<assembly>
> +  <id>bin</id>

The 'bin' in the filename comes from the id.

I tried changing it locally to <id></id> (nothing) and it now builds
commons-digester-1.8-SNAPSHOT[.zip|.tar.gz]

http://maven.apache.org/plugins/maven-assembly-plugin/assembly.html

--
Wendy

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r474943 - in /jakarta/commons/proper/digester/trunk: pom.xml src/assembly/ src/assembly/bin.xml src/assembly/src.xml

Rahul Akolkar
On 11/14/06, Wendy Smoak <[hidden email]> wrote:

> On 11/14/06, [hidden email] <[hidden email]> wrote:
>
> > +TODO:
> > + 2. Would like binary distros to be *.zip rather than *-bin.zip, for example
> ...
> > +<assembly>
> > +  <id>bin</id>
>
> The 'bin' in the filename comes from the id.
>
> I tried changing it locally to <id></id> (nothing) and it now builds
> commons-digester-1.8-SNAPSHOT[.zip|.tar.gz]
>
> http://maven.apache.org/plugins/maven-assembly-plugin/assembly.html
>
<snip/>

Thanks! I knew it was coming from the <id> but really wanted to
override it to not have a suffix for the distro artifacts (yet leave
the <id> as 'bin' or 'binary'). Will just leave it blank for now ;-)

-Rahul


> --
> Wendy
>

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r474943 - in /jakarta/commons/proper/digester/trunk: pom.xml src/assembly/ src/assembly/bin.xml src/assembly/src.xml

Rahul Akolkar
On 11/14/06, Rahul Akolkar <[hidden email]> wrote:

> On 11/14/06, Wendy Smoak <[hidden email]> wrote:
> > On 11/14/06, [hidden email] <[hidden email]> wrote:
> >
> > > +TODO:
> > > + 2. Would like binary distros to be *.zip rather than *-bin.zip, for example
> > ...
> > > +<assembly>
> > > +  <id>bin</id>
> >
> > The 'bin' in the filename comes from the id.
> >
> > I tried changing it locally to <id></id> (nothing) and it now builds
> > commons-digester-1.8-SNAPSHOT[.zip|.tar.gz]
> >
> > http://maven.apache.org/plugins/maven-assembly-plugin/assembly.html
> >
> <snip/>
>
> Thanks! I knew it was coming from the <id> but really wanted to
> override it to not have a suffix for the distro artifacts (yet leave
> the <id> as 'bin' or 'binary'). Will just leave it blank for now ;-)
>
<snip/>

And now I remember why I wanted to retain 'bin' as the descriptor ID.
The nightly script looks for a descriptor with ID 'bin' for assembling
the binary distro (if we move to m2 for the nightlies). Looks like we
need "pack options" in the assembly plugin to tweak the packaging.

-Rahul


> -Rahul
>
>
> > --
> > Wendy
> >
>

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r474943 - in /jakarta/commons/proper/digester/trunk: pom.xml src/assembly/ src/assembly/bin.xml src/assembly/src.xml

Wendy Smoak
On 11/19/06, Rahul Akolkar <[hidden email]> wrote:

> And now I remember why I wanted to retain 'bin' as the descriptor ID.
> The nightly script looks for a descriptor with ID 'bin' for assembling
> the binary distro (if we move to m2 for the nightlies). Looks like we
> need "pack options" in the assembly plugin to tweak the packaging.

Okay, put the <id> back, and try setting 'appendAssemblyId' to false
inside <configuration>.

http://maven.apache.org/plugins/maven-assembly-plugin/assembly-mojo.html

(Those are the latest docs from svn.  If it doesn't work, it's
possible that the parameter was added after the last release of the
assembly plugin.)

--
Wendy

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r474943 - in /jakarta/commons/proper/digester/trunk: pom.xml src/assembly/ src/assembly/bin.xml src/assembly/src.xml

Rahul Akolkar
On 11/19/06, Wendy Smoak <[hidden email]> wrote:

> On 11/19/06, Rahul Akolkar <[hidden email]> wrote:
>
> > And now I remember why I wanted to retain 'bin' as the descriptor ID.
> > The nightly script looks for a descriptor with ID 'bin' for assembling
> > the binary distro (if we move to m2 for the nightlies). Looks like we
> > need "pack options" in the assembly plugin to tweak the packaging.
>
> Okay, put the <id> back, and try setting 'appendAssemblyId' to false
> inside <configuration>.
>
<snip/>

Thats plugin config though, probably won't be descriptor-specific.

Thanks for your help with this. Since digester currently has 1.8-RC1
cut, I'm not going to make any non-essential changes ATM (from a 1.8
PoV). Need to revisit, for a m2 release.

-Rahul



> http://maven.apache.org/plugins/maven-assembly-plugin/assembly-mojo.html
>
> (Those are the latest docs from svn.  If it doesn't work, it's
> possible that the parameter was added after the last release of the
> assembly plugin.)
>
> --
> Wendy
>

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]