You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2008/03/18 05:45:20 UTC
svn commit: r638214 - in /directory/sandbox/akarasulu/bigbang/daemon: ./
bootstrappers/ bootstrappers/src/site/ plugin/
plugin/src/main/java/org/apache/directory/daemon/installers/ plugin/src/site/
Author: akarasulu
Date: Mon Mar 17 21:45:18 2008
New Revision: 638214
URL: http://svn.apache.org/viewvc?rev=638214&view=rev
Log:
[MERGE] pulling in changes from the bigbang branch to minimize conflicts
Added:
directory/sandbox/akarasulu/bigbang/daemon/bootstrappers/src/site/
- copied from r638212, directory/daemon/branches/bigbang/bootstrappers/src/site/
directory/sandbox/akarasulu/bigbang/daemon/bootstrappers/src/site/site.xml
- copied unchanged from r638212, directory/daemon/branches/bigbang/bootstrappers/src/site/site.xml
directory/sandbox/akarasulu/bigbang/daemon/plugin/src/site/
- copied from r638212, directory/daemon/branches/bigbang/plugin/src/site/
directory/sandbox/akarasulu/bigbang/daemon/plugin/src/site/site.xml
- copied unchanged from r638212, directory/daemon/branches/bigbang/plugin/src/site/site.xml
Modified:
directory/sandbox/akarasulu/bigbang/daemon/ (props changed)
directory/sandbox/akarasulu/bigbang/daemon/LAST_BIG_BANG_MERGE
directory/sandbox/akarasulu/bigbang/daemon/bootstrappers/pom.xml
directory/sandbox/akarasulu/bigbang/daemon/plugin/pom.xml
directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java
directory/sandbox/akarasulu/bigbang/daemon/pom.xml
Propchange: directory/sandbox/akarasulu/bigbang/daemon/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 17 21:45:18 2008
@@ -1,3 +1,4 @@
target
workspace
*.iml
+.project
Modified: directory/sandbox/akarasulu/bigbang/daemon/LAST_BIG_BANG_MERGE
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/daemon/LAST_BIG_BANG_MERGE?rev=638214&r1=638213&r2=638214&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/daemon/LAST_BIG_BANG_MERGE (original)
+++ directory/sandbox/akarasulu/bigbang/daemon/LAST_BIG_BANG_MERGE Mon Mar 17 21:45:18 2008
@@ -9,3 +9,7 @@
svn merge -r 604351:613581 https://svn.apache.org/repos/asf/directory/daemon/branches/bigbang .
NOTHING CHANGED ...
+Tue Mar 18 00:47:53 EDT 2008
+----------------------------
+svn merge -r 613581:638212 https://svn.apache.org/repos/asf/directory/daemon/branches/bigbang .
+
Modified: directory/sandbox/akarasulu/bigbang/daemon/bootstrappers/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/daemon/bootstrappers/pom.xml?rev=638214&r1=638213&r2=638214&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/daemon/bootstrappers/pom.xml (original)
+++ directory/sandbox/akarasulu/bigbang/daemon/bootstrappers/pom.xml Mon Mar 17 21:45:18 2008
@@ -32,6 +32,7 @@
an installation footprint.
</description>
+<!--
<distributionManagement>
<site>
<id>apache.websites</id>
@@ -40,6 +41,7 @@
</url>
</site>
</distributionManagement>
+-->
<build>
<plugins>
Modified: directory/sandbox/akarasulu/bigbang/daemon/plugin/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/daemon/plugin/pom.xml?rev=638214&r1=638213&r2=638214&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/daemon/plugin/pom.xml (original)
+++ directory/sandbox/akarasulu/bigbang/daemon/plugin/pom.xml Mon Mar 17 21:45:18 2008
@@ -31,12 +31,14 @@
A plugin that builds installers using bootstrappers and commons-daemon procrun and jsvc
</description>
+<!--
<distributionManagement>
<site>
<id>apache.websites</id>
<url>scp://minotaur.apache.org/www/directory.apache.org/newsite/subprojects/daemon/</url>
</site>
</distributionManagement>
+-->
<dependencies>
<dependency>
Modified: directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java?rev=638214&r1=638213&r2=638214&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java (original)
+++ directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java Mon Mar 17 21:45:18 2008
@@ -60,7 +60,7 @@
* @version $Rev$
*/
public class ServiceInstallersMojo extends AbstractMojo
-{
+{
static final String BOOTSTRAPPER_ARTIFACT_ID = "daemon-bootstrappers";
static final String BOOTSTRAPPER_GROUP_ID = "org.apache.directory.daemon";
static final String LOGGER_ARTIFACT_ID = "slf4j-api";
@@ -213,7 +213,7 @@
setBootstrapArtifacts();
// generate installers for all targets
- for ( Target target:allTargets )
+ for ( Target target : allTargets )
{
// create the installation image first
CreateImageCommand imgCmd = new CreateImageCommand( this, target );
@@ -272,10 +272,11 @@
{
return;
}
-
- list = Arrays.asList( array );
+
+ list.addAll( Arrays.asList( array ) );
}
+
private void setDefaults() throws MojoFailureException
{
if ( allTargets == null )
@@ -346,10 +347,11 @@
if ( application.getAuthors() == null )
{
List<String> authors = new ArrayList<String>();
- @SuppressWarnings(value={"unchecked"})
+ @SuppressWarnings(value =
+ { "unchecked" })
List<Developer> developers = project.getDevelopers();
-
- for ( Developer developer:developers )
+
+ for ( Developer developer : developers )
{
if ( developer.getEmail() != null )
{
@@ -389,7 +391,7 @@
application.setLicense( new File( "LICENSE" ) );
}
- for ( Target target:allTargets )
+ for ( Target target : allTargets )
{
if ( target.getApplication() == null )
{
@@ -442,7 +444,7 @@
private void setupSourcesAndDocs() throws MojoFailureException
{
File generatedDocs = null;
-
+
if ( svnBaseUrl != null )
{
exportedSources = new File( outputDirectory, "src" );
@@ -463,7 +465,7 @@
{
Artifact artifact = null;
Iterator artifacts = project.getDependencyArtifacts().iterator();
-
+
while ( artifacts.hasNext() )
{
artifact = ( Artifact ) artifacts.next();
@@ -515,7 +517,7 @@
getLog().info( "----------------------------- allTargets -----------------------------" );
boolean isFirst = true;
-
+
if ( allTargets != null )
{
if ( isFirst )
@@ -526,21 +528,17 @@
{
getLog().info( "" );
}
-
- for ( Target target:allTargets )
+
+ for ( Target target : allTargets )
{
getLog().info( "id: " + target.getId() );
getLog().info( "osName: " + target.getOsName() );
getLog().info( "osArch: " + target.getOsArch() );
getLog().info( "osVersion: " + target.getOsVersion() );
getLog().info( "daemonFramework: " + target.getDaemonFramework() );
- getLog().info(
- "loggerConfigurationFile: " + target.getLoggerConfigurationFile() );
- getLog().info(
- "bootstrapperConfigurationFiles: "
- + target.getBootstrapperConfigurationFile() );
- getLog().info(
- "serverConfigurationFil: " + target.getServerConfigurationFile() );
+ getLog().info( "loggerConfigurationFile: " + target.getLoggerConfigurationFile() );
+ getLog().info( "bootstrapperConfigurationFiles: " + target.getBootstrapperConfigurationFile() );
+ getLog().info( "serverConfigurationFil: " + target.getServerConfigurationFile() );
}
}
Modified: directory/sandbox/akarasulu/bigbang/daemon/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/daemon/pom.xml?rev=638214&r1=638213&r2=638214&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/daemon/pom.xml (original)
+++ directory/sandbox/akarasulu/bigbang/daemon/pom.xml Mon Mar 17 21:45:18 2008
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.directory.project</groupId>
<artifactId>project</artifactId>
- <version>9-SNAPSHOT</version>
+ <version>10-SNAPSHOT</version>
</parent>
<groupId>org.apache.directory.daemon</groupId>
<artifactId>daemon-parent</artifactId>
@@ -125,6 +125,14 @@
</plugins>
</build>
+ <distributionManagement>
+ <site>
+ <id>apache.directory.studio</id>
+ <!-- FIXME set final url according to CI -->
+ <url>scpexe://people.apache.org/home/felixk/public_html/projects/directory/daemon/</url>
+ </site>
+ </distributionManagement>
+
<reporting>
<excludeDefaults>true</excludeDefaults>
<plugins>
@@ -134,11 +142,17 @@
<reportSets>
<reportSet>
<reports>
+ <!--
<report>project-team</report>
<report>mailing-list</report>
<report>issue-tracking</report>
<report>license</report>
<report>scm</report>
+ -->
+ <report>license</report>
+ <report>dependencies</report>
+ <report>issue-tracking</report>
+ <report>index</report>
</reports>
</reportSet>
</reportSets>
@@ -150,6 +164,71 @@
<configuration>
<aggregate>true</aggregate>
</configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <linkXref>true</linkXref>
+ <sourceEncoding>utf-8</sourceEncoding>
+ <minimumTokens>100</minimumTokens>
+ <targetJdk>1.5</targetJdk>
+ <aggregate>true</aggregate>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ <configuration>
+ <tags>
+ <tag>TODO</tag>
+ <tag>@todo</tag>
+ <tag>@deprecated</tag>
+ <tag>FIXME</tag>
+ </tags>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>1.1.1</version>
+ <configuration>
+ <xmlOutput>false</xmlOutput>
+ <!--
+ <xmlOutput>true|false</xmlOutput>
+ <xmlOutputDirectory>directory location of xml findbugs report</xmlOutputDirectory>
+ <threshold>High|Normal|Low|Exp|Ignore</threshold>
+ <effort>Min|Default|Max</effort>
+ <excludeFilterFile>findbugs-exclude.xml</excludeFilterFile>
+ <includeFilterFile>findbugs-include.xml</includeFilterFile>
+ <visitors>FindDeadLocalStores,UnreadFields</visitors>
+ <omitVisitors>FindDeadLocalStores,UnreadFields</omitVisitors>
+ <onlyAnalyze>org.codehaus.mojo.findbugs.*</onlyAnalyze>
+ <pluginList>/libs/fb-contrib/fb-contrib-2.8.0.jar</pluginList>
+ <debug>true|false</debug>
+ <relaxed>true|false</relaxed>
+ -->
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
</plugins>
</reporting>