foray-commit Mailing List for FOray
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
foray-commit — FOray repository commit log messages
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
(139) |
Apr
(98) |
May
(250) |
Jun
(394) |
Jul
(84) |
Aug
(13) |
Sep
(420) |
Oct
(186) |
Nov
(1) |
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(108) |
Feb
(202) |
Mar
(291) |
Apr
(247) |
May
(374) |
Jun
(227) |
Jul
(231) |
Aug
(60) |
Sep
(31) |
Oct
(45) |
Nov
(18) |
Dec
|
| 2008 |
Jan
(38) |
Feb
(71) |
Mar
(142) |
Apr
|
May
(59) |
Jun
(6) |
Jul
(10) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
(12) |
Feb
(4) |
Mar
(88) |
Apr
(121) |
May
(17) |
Jun
(30) |
Jul
|
Aug
(5) |
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2010 |
Jan
(11) |
Feb
(76) |
Mar
(11) |
Apr
|
May
(11) |
Jun
|
Jul
|
Aug
(44) |
Sep
(14) |
Oct
(7) |
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(9) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(10) |
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(3) |
Jul
(4) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(168) |
| 2017 |
Jan
(77) |
Feb
(11) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
(1) |
Apr
(6) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
(88) |
Mar
(118) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2020 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(6) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(141) |
| 2021 |
Jan
(170) |
Feb
(20) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
(62) |
Nov
(189) |
Dec
(162) |
| 2022 |
Jan
(201) |
Feb
(118) |
Mar
(8) |
Apr
|
May
(2) |
Jun
(47) |
Jul
(19) |
Aug
(14) |
Sep
(3) |
Oct
|
Nov
(28) |
Dec
(235) |
| 2023 |
Jan
(112) |
Feb
(23) |
Mar
(2) |
Apr
(2) |
May
|
Jun
(1) |
Jul
|
Aug
(70) |
Sep
(92) |
Oct
(20) |
Nov
(1) |
Dec
(1) |
| 2024 |
Jan
|
Feb
|
Mar
(1) |
Apr
(1) |
May
(14) |
Jun
(11) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2025 |
Jan
(10) |
Feb
(29) |
Mar
|
Apr
(162) |
May
(245) |
Jun
(83) |
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
|
|
|
|
1
|
|
2
|
3
|
4
|
5
|
6
|
7
|
8
|
|
9
|
10
|
11
|
12
|
13
|
14
|
15
|
|
16
|
17
|
18
|
19
|
20
|
21
|
22
|
|
23
|
24
|
25
|
26
(2) |
27
(1) |
28
|
29
(7) |
|
30
|
31
|
|
|
|
|
|
|
From: <vic...@us...> - 2011-10-29 22:51:09
|
Revision: 11086
http://foray.svn.sourceforge.net/foray/?rev=11086&view=rev
Author: victormote
Date: 2011-10-29 22:51:03 +0000 (Sat, 29 Oct 2011)
Log Message:
-----------
Remove no-longer needed dependency artifacts. Now converted to Maven build scheme.
Removed Paths:
-------------
trunk/foray/lib/
trunk/foray/lib-build/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2011-10-29 22:44:55
|
Revision: 11085
http://foray.svn.sourceforge.net/foray/?rev=11085&view=rev
Author: victormote
Date: 2011-10-29 22:44:49 +0000 (Sat, 29 Oct 2011)
Log Message:
-----------
Get distribution assemblies named properly and using a matching internal base directory.
Modified Paths:
--------------
trunk/foray/foray-all/scripts/maven/maven-assembly-bin-all.xml
trunk/foray/foray-all/scripts/maven/maven-assembly-source.xml
trunk/foray/foray-all-distribution/pom.xml
Modified: trunk/foray/foray-all/scripts/maven/maven-assembly-bin-all.xml
===================================================================
--- trunk/foray/foray-all/scripts/maven/maven-assembly-bin-all.xml 2011-10-29 21:58:16 UTC (rev 11084)
+++ trunk/foray/foray-all/scripts/maven/maven-assembly-bin-all.xml 2011-10-29 22:44:49 UTC (rev 11085)
@@ -8,7 +8,6 @@
<format>zip</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>foray-${project.version}-bin-all</baseDirectory>
<fileSets>
<fileSet>
<directory>${project.basedir}/../foray-all/config</directory>
Modified: trunk/foray/foray-all/scripts/maven/maven-assembly-source.xml
===================================================================
--- trunk/foray/foray-all/scripts/maven/maven-assembly-source.xml 2011-10-29 21:58:16 UTC (rev 11084)
+++ trunk/foray/foray-all/scripts/maven/maven-assembly-source.xml 2011-10-29 22:44:49 UTC (rev 11085)
@@ -7,6 +7,7 @@
<formats>
<format>zip</format>
</formats>
+ <includeBaseDirectory>true</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>${project.basedir}/..</directory>
Modified: trunk/foray/foray-all-distribution/pom.xml
===================================================================
--- trunk/foray/foray-all-distribution/pom.xml 2011-10-29 21:58:16 UTC (rev 11084)
+++ trunk/foray/foray-all-distribution/pom.xml 2011-10-29 22:44:49 UTC (rev 11085)
@@ -50,20 +50,48 @@
<version>2.2.1</version>
<executions>
<execution>
- <id>distribution-package-assemblies</id>
+ <id>foray-src</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
+ <configuration>
+ <finalName>foray-${project.version}-src</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>../foray-all/scripts/maven/maven-assembly-source.xml</descriptor>
+ </descriptors>
+ </configuration>
</execution>
+ <execution>
+ <id>foray-shaded</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>foray-${project.version}-shaded</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>../foray-all/scripts/maven/maven-assembly-shaded.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ <execution>
+ <id>foray-bin-all</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>foray-${project.version}-bin-all</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>../foray-all/scripts/maven/maven-assembly-bin-all.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
</executions>
- <configuration>
- <descriptors>
- <descriptor>../foray-all/scripts/maven/maven-assembly-source.xml</descriptor>
- <descriptor>../foray-all/scripts/maven/maven-assembly-shaded.xml</descriptor>
- <descriptor>../foray-all/scripts/maven/maven-assembly-bin-all.xml</descriptor>
- </descriptors>
- </configuration>
</plugin>
</plugins>
</build>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2011-10-29 21:58:23
|
Revision: 11084
http://foray.svn.sourceforge.net/foray/?rev=11084&view=rev
Author: victormote
Date: 2011-10-29 21:58:16 +0000 (Sat, 29 Oct 2011)
Log Message:
-----------
Add maven assembly for the standard binary build.
Modified Paths:
--------------
trunk/foray/foray-all/scripts/maven/maven-assembly-source.xml
trunk/foray/foray-all-distribution/pom.xml
Added Paths:
-----------
trunk/foray/foray-all/scripts/maven/maven-assembly-bin-all.xml
Added: trunk/foray/foray-all/scripts/maven/maven-assembly-bin-all.xml
===================================================================
--- trunk/foray/foray-all/scripts/maven/maven-assembly-bin-all.xml (rev 0)
+++ trunk/foray/foray-all/scripts/maven/maven-assembly-bin-all.xml 2011-10-29 21:58:16 UTC (rev 11084)
@@ -0,0 +1,44 @@
+<assembly
+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
+ http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+ <id>bin-all</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <baseDirectory>foray-${project.version}-bin-all</baseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}/../foray-all/config</directory>
+ <outputDirectory>config</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>${project.basedir}/../foray-all/doc</directory>
+ <outputDirectory>doc</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>${project.basedir}/../foray-all/resource</directory>
+ <outputDirectory>resource</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>${project.basedir}/../foray-all/scripts</directory>
+ <outputDirectory>scripts</outputDirectory>
+ </fileSet>
+ </fileSets>
+
+ <!-- All of the jar files, both for FOray and its dependencies. -->
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <useProjectArtifact>true</useProjectArtifact>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
Modified: trunk/foray/foray-all/scripts/maven/maven-assembly-source.xml
===================================================================
--- trunk/foray/foray-all/scripts/maven/maven-assembly-source.xml 2011-10-29 19:14:58 UTC (rev 11083)
+++ trunk/foray/foray-all/scripts/maven/maven-assembly-source.xml 2011-10-29 21:58:16 UTC (rev 11084)
@@ -5,7 +5,6 @@
http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<id>src</id>
<formats>
- <format>tar.gz</format>
<format>zip</format>
</formats>
<fileSets>
Modified: trunk/foray/foray-all-distribution/pom.xml
===================================================================
--- trunk/foray/foray-all-distribution/pom.xml 2011-10-29 19:14:58 UTC (rev 11083)
+++ trunk/foray/foray-all-distribution/pom.xml 2011-10-29 21:58:16 UTC (rev 11084)
@@ -61,6 +61,7 @@
<descriptors>
<descriptor>../foray-all/scripts/maven/maven-assembly-source.xml</descriptor>
<descriptor>../foray-all/scripts/maven/maven-assembly-shaded.xml</descriptor>
+ <descriptor>../foray-all/scripts/maven/maven-assembly-bin-all.xml</descriptor>
</descriptors>
</configuration>
</plugin>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2011-10-29 19:15:04
|
Revision: 11083
http://foray.svn.sourceforge.net/foray/?rev=11083&view=rev
Author: victormote
Date: 2011-10-29 19:14:58 +0000 (Sat, 29 Oct 2011)
Log Message:
-----------
1. Remove assembly stuff from the non-distribution POMs.
2. Add comments to foray-all-distribution POM about why this project is needed.
Modified Paths:
--------------
trunk/foray/foray-all/pom.xml
trunk/foray/foray-all-distribution/pom.xml
trunk/foray/foray-app/pom.xml
Modified: trunk/foray/foray-all/pom.xml
===================================================================
--- trunk/foray/foray-all/pom.xml 2011-10-29 18:48:43 UTC (rev 11082)
+++ trunk/foray/foray-all/pom.xml 2011-10-29 19:14:58 UTC (rev 11083)
@@ -581,26 +581,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2.1</version>
- <executions>
- <execution>
- <id>distribution-package-assemblies</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <descriptors>
- <descriptor>scripts/maven/maven-assembly-source.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
</plugins>
-
</build>
<modules>
Modified: trunk/foray/foray-all-distribution/pom.xml
===================================================================
--- trunk/foray/foray-all-distribution/pom.xml 2011-10-29 18:48:43 UTC (rev 11082)
+++ trunk/foray/foray-all-distribution/pom.xml 2011-10-29 19:14:58 UTC (rev 11083)
@@ -3,6 +3,20 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+<!--
+************************************************************************************************************************
+The existence of this Maven project is only for the purpose of creating the distribution builds.
+We would have preferred to make this part of the foray-all project, but Maven wants to build foray-all before it has
+built the other projects, which makes the distribution empty and useless.
+This could be avoided by making foray-all dependent on the other projects, but this causes some circular dependencies.
+What is needed is something like a build-time scope for such dependencies.
+There are other possible solutions that Maven may adopt in the future as well.
+We have left the assembly descriptor files in the foray-all project.
+When Maven is capable of handling the build correctly, this foray-all-distribution project should be eliminate and the
+build of the assemblies handled here should be moved to foray-all.
+************************************************************************************************************************
+-->
+
<modelVersion>4.0.0</modelVersion>
<groupId>org.foray</groupId>
@@ -45,6 +59,7 @@
</executions>
<configuration>
<descriptors>
+ <descriptor>../foray-all/scripts/maven/maven-assembly-source.xml</descriptor>
<descriptor>../foray-all/scripts/maven/maven-assembly-shaded.xml</descriptor>
</descriptors>
</configuration>
Modified: trunk/foray/foray-app/pom.xml
===================================================================
--- trunk/foray/foray-app/pom.xml 2011-10-29 18:48:43 UTC (rev 11082)
+++ trunk/foray/foray-app/pom.xml 2011-10-29 19:14:58 UTC (rev 11083)
@@ -173,27 +173,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2.1</version>
- <executions>
- <execution>
- <id>distribution-package-assemblies</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <descriptors>
- <descriptor>../foray-all/scripts/maven/maven-assembly-shaded.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2011-10-29 18:48:50
|
Revision: 11082
http://foray.svn.sourceforge.net/foray/?rev=11082&view=rev
Author: victormote
Date: 2011-10-29 18:48:43 +0000 (Sat, 29 Oct 2011)
Log Message:
-----------
Add new project to handle the build of the distribution.
Modified Paths:
--------------
trunk/foray/foray-all/pom.xml
Added Paths:
-----------
trunk/foray/foray-all-distribution/
trunk/foray/foray-all-distribution/pom.xml
Modified: trunk/foray/foray-all/pom.xml
===================================================================
--- trunk/foray/foray-all/pom.xml 2011-10-29 17:30:17 UTC (rev 11081)
+++ trunk/foray/foray-all/pom.xml 2011-10-29 18:48:43 UTC (rev 11082)
@@ -359,6 +359,13 @@
<!-- Other FOray modules. -->
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>foray-app</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>foray-areatree</artifactId>
<version>${project.version}</version>
<type>jar</type>
@@ -597,6 +604,7 @@
</build>
<modules>
+ <module>../foray-all-distribution</module>
<module>../foray-app</module>
<module>../foray-areatree</module>
<module>../foray-common</module>
Property changes on: trunk/foray/foray-all-distribution
___________________________________________________________________
Added: svn:ignore
+ .project
.settings
target
Added: trunk/foray/foray-all-distribution/pom.xml
===================================================================
--- trunk/foray/foray-all-distribution/pom.xml (rev 0)
+++ trunk/foray/foray-all-distribution/pom.xml 2011-10-29 18:48:43 UTC (rev 11082)
@@ -0,0 +1,55 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.foray</groupId>
+ <artifactId>foray-all-distribution</artifactId>
+
+ <packaging>pom</packaging>
+
+ <parent>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-all</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <relativePath>../foray-all/pom.xml</relativePath>
+ </parent>
+ <name>foray-all-distribution</name>
+
+ <dependencies>
+ <dependency>
+ <!-- We only need foray-app here because it has transitive dependencies on everything
+ else. -->
+ <groupId>${project.groupId}</groupId>
+ <artifactId>foray-app</artifactId>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2.1</version>
+ <executions>
+ <execution>
+ <id>distribution-package-assemblies</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <descriptors>
+ <descriptor>../foray-all/scripts/maven/maven-assembly-shaded.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2011-10-29 17:30:23
|
Revision: 11081
http://foray.svn.sourceforge.net/foray/?rev=11081&view=rev
Author: victormote
Date: 2011-10-29 17:30:17 +0000 (Sat, 29 Oct 2011)
Log Message:
-----------
Move actual build of the source assembly to the "all" project.
Modified Paths:
--------------
trunk/foray/foray-all/pom.xml
trunk/foray/foray-app/pom.xml
Property Changed:
----------------
trunk/foray/foray-all/
Property changes on: trunk/foray/foray-all
___________________________________________________________________
Modified: svn:ignore
- .project
.settings
+ .project
.settings
target
Modified: trunk/foray/foray-all/pom.xml
===================================================================
--- trunk/foray/foray-all/pom.xml 2011-10-29 17:09:41 UTC (rev 11080)
+++ trunk/foray/foray-all/pom.xml 2011-10-29 17:30:17 UTC (rev 11081)
@@ -574,6 +574,24 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2.1</version>
+ <executions>
+ <execution>
+ <id>distribution-package-assemblies</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <descriptors>
+ <descriptor>scripts/maven/maven-assembly-source.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: trunk/foray/foray-app/pom.xml
===================================================================
--- trunk/foray/foray-app/pom.xml 2011-10-29 17:09:41 UTC (rev 11080)
+++ trunk/foray/foray-app/pom.xml 2011-10-29 17:30:17 UTC (rev 11081)
@@ -190,7 +190,6 @@
<configuration>
<descriptors>
<descriptor>../foray-all/scripts/maven/maven-assembly-shaded.xml</descriptor>
- <descriptor>../foray-all/scripts/maven/maven-assembly-source.xml</descriptor>
</descriptors>
</configuration>
</plugin>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2011-10-29 17:09:48
|
Revision: 11080
http://foray.svn.sourceforge.net/foray/?rev=11080&view=rev
Author: victormote
Date: 2011-10-29 17:09:41 +0000 (Sat, 29 Oct 2011)
Log Message:
-----------
Move the assembly descriptors to the "all" project.
Modified Paths:
--------------
trunk/foray/foray-app/pom.xml
Added Paths:
-----------
trunk/foray/foray-all/scripts/maven/maven-assembly-shaded.xml
trunk/foray/foray-all/scripts/maven/maven-assembly-source.xml
Removed Paths:
-------------
trunk/foray/foray-app/scripts/maven-assembly-shaded.xml
trunk/foray/foray-app/scripts/maven-assembly-source.xml
Copied: trunk/foray/foray-all/scripts/maven/maven-assembly-shaded.xml (from rev 11078, trunk/foray/foray-app/scripts/maven-assembly-shaded.xml)
===================================================================
--- trunk/foray/foray-all/scripts/maven/maven-assembly-shaded.xml (rev 0)
+++ trunk/foray/foray-all/scripts/maven/maven-assembly-shaded.xml 2011-10-29 17:09:41 UTC (rev 11080)
@@ -0,0 +1,19 @@
+<assembly
+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
+ http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+ <id>shaded</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/</outputDirectory>
+ <useProjectArtifact>true</useProjectArtifact>
+ <unpack>true</unpack>
+ <scope>runtime</scope>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Copied: trunk/foray/foray-all/scripts/maven/maven-assembly-source.xml (from rev 11079, trunk/foray/foray-app/scripts/maven-assembly-source.xml)
===================================================================
--- trunk/foray/foray-all/scripts/maven/maven-assembly-source.xml (rev 0)
+++ trunk/foray/foray-all/scripts/maven/maven-assembly-source.xml 2011-10-29 17:09:41 UTC (rev 11080)
@@ -0,0 +1,24 @@
+<assembly
+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
+ http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+ <id>src</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}/..</directory>
+ <includes>
+ <include>**/src/**</include>
+ </includes>
+ <excludes>
+ <exclude>lib/**</exclude>
+ <exclude>lib-build/**</exclude>
+ </excludes>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ </fileSet>
+ </fileSets>
+</assembly>
Modified: trunk/foray/foray-app/pom.xml
===================================================================
--- trunk/foray/foray-app/pom.xml 2011-10-27 00:05:13 UTC (rev 11079)
+++ trunk/foray/foray-app/pom.xml 2011-10-29 17:09:41 UTC (rev 11080)
@@ -189,8 +189,8 @@
</executions>
<configuration>
<descriptors>
- <descriptor>scripts/maven-assembly-shaded.xml</descriptor>
- <descriptor>scripts/maven-assembly-source.xml</descriptor>
+ <descriptor>../foray-all/scripts/maven/maven-assembly-shaded.xml</descriptor>
+ <descriptor>../foray-all/scripts/maven/maven-assembly-source.xml</descriptor>
</descriptors>
</configuration>
</plugin>
Deleted: trunk/foray/foray-app/scripts/maven-assembly-shaded.xml
===================================================================
--- trunk/foray/foray-app/scripts/maven-assembly-shaded.xml 2011-10-27 00:05:13 UTC (rev 11079)
+++ trunk/foray/foray-app/scripts/maven-assembly-shaded.xml 2011-10-29 17:09:41 UTC (rev 11080)
@@ -1,19 +0,0 @@
-<assembly
- xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
- http://maven.apache.org/xsd/assembly-1.1.2.xsd">
- <id>shaded</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <outputDirectory>/</outputDirectory>
- <useProjectArtifact>true</useProjectArtifact>
- <unpack>true</unpack>
- <scope>runtime</scope>
- </dependencySet>
- </dependencySets>
-</assembly>
Deleted: trunk/foray/foray-app/scripts/maven-assembly-source.xml
===================================================================
--- trunk/foray/foray-app/scripts/maven-assembly-source.xml 2011-10-27 00:05:13 UTC (rev 11079)
+++ trunk/foray/foray-app/scripts/maven-assembly-source.xml 2011-10-29 17:09:41 UTC (rev 11080)
@@ -1,24 +0,0 @@
-<assembly
- xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
- http://maven.apache.org/xsd/assembly-1.1.2.xsd">
- <id>src</id>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>${project.basedir}/..</directory>
- <includes>
- <include>**/src/**</include>
- </includes>
- <excludes>
- <exclude>lib/**</exclude>
- <exclude>lib-build/**</exclude>
- </excludes>
- <useDefaultExcludes>true</useDefaultExcludes>
- </fileSet>
- </fileSets>
-</assembly>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2011-10-27 00:05:19
|
Revision: 11079
http://foray.svn.sourceforge.net/foray/?rev=11079&view=rev
Author: victormote
Date: 2011-10-27 00:05:13 +0000 (Thu, 27 Oct 2011)
Log Message:
-----------
Add assembly for the source distribution.
Modified Paths:
--------------
trunk/foray/foray-app/pom.xml
Added Paths:
-----------
trunk/foray/foray-app/scripts/maven-assembly-source.xml
Modified: trunk/foray/foray-app/pom.xml
===================================================================
--- trunk/foray/foray-app/pom.xml 2011-10-26 23:19:27 UTC (rev 11078)
+++ trunk/foray/foray-app/pom.xml 2011-10-27 00:05:13 UTC (rev 11079)
@@ -180,7 +180,7 @@
<version>2.2.1</version>
<executions>
<execution>
- <id>create-shaded-jar</id>
+ <id>distribution-package-assemblies</id>
<phase>package</phase>
<goals>
<goal>single</goal>
@@ -190,6 +190,7 @@
<configuration>
<descriptors>
<descriptor>scripts/maven-assembly-shaded.xml</descriptor>
+ <descriptor>scripts/maven-assembly-source.xml</descriptor>
</descriptors>
</configuration>
</plugin>
Added: trunk/foray/foray-app/scripts/maven-assembly-source.xml
===================================================================
--- trunk/foray/foray-app/scripts/maven-assembly-source.xml (rev 0)
+++ trunk/foray/foray-app/scripts/maven-assembly-source.xml 2011-10-27 00:05:13 UTC (rev 11079)
@@ -0,0 +1,24 @@
+<assembly
+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
+ http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+ <id>src</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}/..</directory>
+ <includes>
+ <include>**/src/**</include>
+ </includes>
+ <excludes>
+ <exclude>lib/**</exclude>
+ <exclude>lib-build/**</exclude>
+ </excludes>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ </fileSet>
+ </fileSets>
+</assembly>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2011-10-26 23:19:33
|
Revision: 11078
http://foray.svn.sourceforge.net/foray/?rev=11078&view=rev
Author: victormote
Date: 2011-10-26 23:19:27 +0000 (Wed, 26 Oct 2011)
Log Message:
-----------
Tie the shaded jar assembly to the package phase, so that it is built automatically.
Modified Paths:
--------------
trunk/foray/foray-app/pom.xml
trunk/foray/foray-app/scripts/maven-assembly-shaded.xml
Modified: trunk/foray/foray-app/pom.xml
===================================================================
--- trunk/foray/foray-app/pom.xml 2011-10-26 22:56:03 UTC (rev 11077)
+++ trunk/foray/foray-app/pom.xml 2011-10-26 23:19:27 UTC (rev 11078)
@@ -178,6 +178,15 @@
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2.1</version>
+ <executions>
+ <execution>
+ <id>create-shaded-jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
<configuration>
<descriptors>
<descriptor>scripts/maven-assembly-shaded.xml</descriptor>
Modified: trunk/foray/foray-app/scripts/maven-assembly-shaded.xml
===================================================================
--- trunk/foray/foray-app/scripts/maven-assembly-shaded.xml 2011-10-26 22:56:03 UTC (rev 11077)
+++ trunk/foray/foray-app/scripts/maven-assembly-shaded.xml 2011-10-26 23:19:27 UTC (rev 11078)
@@ -1,7 +1,8 @@
<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
+ http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<id>shaded</id>
<formats>
<format>jar</format>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2011-10-26 22:56:09
|
Revision: 11077
http://foray.svn.sourceforge.net/foray/?rev=11077&view=rev
Author: victormote
Date: 2011-10-26 22:56:03 +0000 (Wed, 26 Oct 2011)
Log Message:
-----------
Add a message for successful pretty-print.
Modified Paths:
--------------
trunk/foray/foray-xml/src/main/java/org/foray/xml/FOrayPretty.java
Modified: trunk/foray/foray-xml/src/main/java/org/foray/xml/FOrayPretty.java
===================================================================
--- trunk/foray/foray-xml/src/main/java/org/foray/xml/FOrayPretty.java 2011-05-30 19:13:28 UTC (rev 11076)
+++ trunk/foray/foray-xml/src/main/java/org/foray/xml/FOrayPretty.java 2011-10-26 22:56:03 UTC (rev 11077)
@@ -1317,6 +1317,7 @@
e.printStackTrace();
System.exit(FOrayPretty.STATUS_PARSING_ERROR);
}
+ System.out.println("Input: " + input + " successfully pretty-printed,\n output in: " + output);
/* Checkstyle-GenericIllegalRegexp-On. */
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|