[haiku-depot-web] [haiku-depot-web-app] 7 new revisions pushed by haiku.li...@xxxxxxxxx on 2014-09-26 11:09 GMT
- From: haiku-depot-web-app@xxxxxxxxxxxxxx
- To: haiku-depot-web@xxxxxxxxxxxxx
- Date: Fri, 26 Sep 2014 11:10:01 +0000
master moved from a8b9d8d62298 to e5550b83ef90
7 new revisions:
Revision: b762e88db471
Author: Andrew Lindesay <apl@xxxxxxxxxxxxxx>
Date: Mon Sep 22 19:13:25 2014 UTC
Log: minor localization change from Joe
https://code.google.com/p/haiku-depot-web-app/source/detail?r=b762e88db471
Revision: 6b9617ec6372
Author: Andrew Lindesay <apl@xxxxxxxxxxxxxx>
Date: Tue Sep 23 11:38:43 2014 UTC
Log: better logging for validation exception
https://code.google.com/p/haiku-depot-web-app/source/detail?r=6b9617ec6372
Revision: 77bb5121f88e
Author: Andrew Lindesay <apl@xxxxxxxxxxxxxx>
Date: Fri Sep 26 09:53:20 2014 UTC
Log: separated production and test RPM generation
https://code.google.com/p/haiku-depot-web-app/source/detail?r=77bb5121f88e
Revision: 0515941570fc
Author: Andrew Lindesay <apl@xxxxxxxxxxxxxx>
Date: Fri Sep 26 10:55:41 2014 UTC
Log: updated documentation related to the RPM assembly
https://code.google.com/p/haiku-depot-web-app/source/detail?r=0515941570fc
Revision: 2dd9d056d09d
Author: Andrew Lindesay <apl@xxxxxxxxxxxxxx>
Date: Fri Sep 26 11:05:06 2014 UTC
Log: modified build version script for rpm assembly changes
https://code.google.com/p/haiku-depot-web-app/source/detail?r=2dd9d056d09d
Revision: 62ef871579f1
Author: Andrew Lindesay <apl@xxxxxxxxxxxxxx>
Date: Fri Sep 26 11:07:26 2014 UTC
Log: version 1.0.7
https://code.google.com/p/haiku-depot-web-app/source/detail?r=62ef871579f1
Revision: e5550b83ef90
Author: Andrew Lindesay <apl@xxxxxxxxxxxxxx>
Date: Fri Sep 26 11:08:23 2014 UTC
Log: version 1.0.8-SNAPSHOT
https://code.google.com/p/haiku-depot-web-app/source/detail?r=e5550b83ef90
==============================================================================
Revision: b762e88db471
Author: Andrew Lindesay <apl@xxxxxxxxxxxxxx>
Date: Mon Sep 22 19:13:25 2014 UTC
Log: minor localization change from Joe
https://code.google.com/p/haiku-depot-web-app/source/detail?r=b762e88db471
Modified:
/haikudepotserver-webapp/src/main/resources/messages.properties
=======================================
--- /haikudepotserver-webapp/src/main/resources/messages.properties Fri Sep
12 08:53:03 2014 UTC
+++ /haikudepotserver-webapp/src/main/resources/messages.properties Mon Sep
22 19:13:25 2014 UTC
@@ -256,9 +256,9 @@
initiatePasswordReset.captchaResponse.title=Check for a Person
initiatePasswordReset.action.title=Send Email
initiatePasswordReset.done.title=Email Sent
-initiatePasswordReset.done.description=If your request is successful, an
email will have been sent to \
- the nominated email address. This will contain further instructions
relating to resetting the \
- password to this account.
+initiatePasswordReset.done.description=\
+ If your request is successful, you will receive an email with further\
+ instructions relating to resetting the password for this account.
completePasswordReset.oldPasswordClear.title=Existing Password
completePasswordReset.oldPasswordClear.required=The existing password for
this user is required to prove the user's identity.
==============================================================================
Revision: 6b9617ec6372
Author: Andrew Lindesay <apl@xxxxxxxxxxxxxx>
Date: Tue Sep 23 11:38:43 2014 UTC
Log: better logging for validation exception
https://code.google.com/p/haiku-depot-web-app/source/detail?r=6b9617ec6372
Modified:
/haikudepotserver-api1/src/main/java/org/haikuos/haikudepotserver/api1/support/ValidationException.java
=======================================
---
/haikudepotserver-api1/src/main/java/org/haikuos/haikudepotserver/api1/support/ValidationException.java
Fri Nov 15 08:51:45 2013 UTC
+++
/haikudepotserver-api1/src/main/java/org/haikuos/haikudepotserver/api1/support/ValidationException.java
Tue Sep 23 11:38:43 2014 UTC
@@ -43,7 +43,14 @@
@Override
public String getMessage() {
- return String.format("%d validation
failures",validationFailures.size());
+ switch(validationFailures.size()) {
+ case 0:
+ return "unknown validation failure";
+ case 1:
+ return "validation failure - {}" +
validationFailures.get(0).toString();
+ default:
+ return String.format("%d validation failures",
validationFailures.size());
+ }
}
}
==============================================================================
Revision: 77bb5121f88e
Author: Andrew Lindesay <apl@xxxxxxxxxxxxxx>
Date: Fri Sep 26 09:53:20 2014 UTC
Log: separated production and test RPM generation
https://code.google.com/p/haiku-depot-web-app/source/detail?r=77bb5121f88e
Added:
/haikudepotserver-rpm-common/pom.xml
/haikudepotserver-rpm-common/src/main/resources/config__config.properties
/haikudepotserver-rpm-common/src/main/resources/initd__haikudepotserver
/haikudepotserver-rpm-common/src/main/resources/logging__logback.xml
/haikudepotserver-rpm-common/src/main/resources/logrotate__haikudepotserver
/haikudepotserver-rpm-parent/pom.xml
/haikudepotserver-rpm-production/pom.xml
/haikudepotserver-rpm-test/pom.xml
Deleted:
/haikudepotserver-rpm/pom.xml
/haikudepotserver-rpm/src/main/etc/config__config.properties
/haikudepotserver-rpm/src/main/etc/initd__haikudepotserver
/haikudepotserver-rpm/src/main/etc/logging__logback.xml
/haikudepotserver-rpm/src/main/etc/logrotate__haikudepotserver
Modified:
/haikudepotserver-webapp/src/main/java/org/haikuos/haikudepotserver/multipage/controller/HomeController.java
/pom.xml
/setversion.py
=======================================
--- /dev/null
+++ /haikudepotserver-rpm-common/pom.xml Fri Sep 26 09:53:20 2014 UTC
@@ -0,0 +1,65 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<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";>
+
+ <parent>
+ <artifactId>haikudepotserver-parent</artifactId>
+ <groupId>org.haikuos</groupId>
+ <relativePath>../haikudepotserver-parent</relativePath>
+ <version>1.0.7-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>haikudepotserver-rpm-common</artifactId>
+ <packaging>jar</packaging>
+ <description>
+ This project is a place where support resources that contribute to
the RPM assembly can be
+ bundled so that they can be (re)used in the specific RPMs later.
+ </description>
+
+ <build>
+
+ <!--
+ This will prevent the resources from being filtered in the
bundling process so that they can
+ be filtered (have variables replaced) when they are unbundled
ready for inclusion in the
+ RPM.
+ -->
+
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>false</filtering>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ </resources>
+
+ <plugins>
+
+ <!--
+ This will create a bundle that can be (re)used in assembly of
the various RPMs such as
+ production and test. Note that again, the filtering is
disabled in order to ensure that
+ the raw resources can then be filtered in the unpacking
process.
+ -->
+
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.5</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <includes>
+ <include>*</include>
+ </includes>
+
<useDefaultFilterDelimiters>false</useDefaultFilterDelimiters>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
=======================================
--- /dev/null
+++
/haikudepotserver-rpm-common/src/main/resources/config__config.properties
Fri Sep 26 09:53:20 2014 UTC
@@ -0,0 +1,103 @@
+# ===========================================
+# haikudepotserver@{rpm.variant} - configuration file
+# ===========================================
+
+# -------------------------------------------
+# general
+
+pkgversion.viewcounter.protectrecurringincrementfromsameclient=true
+
+# -------------------------------------------
+# database connection
+
+jdbc.driver=org.postgresql.Driver
+jdbc.url=jdbc:postgresql://localhost:5432/haikudepotserver-x
+jdbc.username=haikudepotserver-x
+jdbc.password=haikudepotserver-x
+
+flyway.migrate=true
+
+# -------------------------------------------
+# user ratings
+
+# How many versions to go back from the latest version in order
+# to find user ratings to aggregate.
+
+userrating.aggregation.pkg.versionsback=2
+
+# How many ratings must be present before an aggregate can be
+# derived; too few and the result will be from too small a sample
+# to be meaningful.
+
+userrating.aggregation.pkg.minratings=3
+
+# -------------------------------------------
+# web infrastructure
+
+# This value relates to the built-in JAWR web-resource compression and
+# concatination system. Review the JAWR documentation for details on
+# the effects of configuring this value to true.
+
+#jawr.debug.on=false
+
+# This URL provides a base URL that the application can then add to when
+# it formulates URLs that are to be used outside of the application; for
+# example, URLs in ATOM feeds etc...
+
+baseurl=https://doesnotexist.haiku-os.org:8080/
+
+# -------------------------------------------
+# web security
+
+# This is the number of seconds for which an authentication token is
+# valid for.
+
+#authentication.jws.expiryseconds=
+
+# This secret is used to sign the tokens used to communicate between
+# the client and the server. This value should be very hard to guess.
+# The output of the command "uuidgen" would be appropriate. This
+# value must be kept secret and not disclosed in public.
+# commented out to force the value to be considered
+
+#authentication.jws.sharedkey=
+
+# This value is used in the production and consumption of the tokens
+# between the client and the server. It is intended that this is
+# consistent for a given deployment. Sample values that may be
+# appropriate;
+#
+# dev.hds
+# prod.hds
+# test.hds
+#
+
+authentication.jws.issuer=dev.hds
+
+# -------------------------------------------
+# email-related
+
+smtp.host=localhost
+#smtp.port=2525
+#smtp.username=
+#smtp.password=
+#smtp.auth=false
+#smtp.starttls=false
+email.from=noreply@xxxxxxxxxxxx
+
+# -------------------------------------------
+# == NOT READY TO BE USED ==
+# LDAP related
+# If the LDAP setting are commented-out then the system will operate as if
+# there were no LDAP server and will not attempt to synchronize user data
+# to the LDAP directory server.
+
+#ldap.host=localhost
+#ldap.port=10389
+#ldap.user.dn=cn=haikudepotserver@{rpm.variant},ou=services,dc=haiku-os,dc=org
+#ldap.password=Pa55word2
+
+# This setting provides the location in the LDAP directory where the users
+# of the system are stored.
+
+#ldap.people.dn=ou=people,dc=haiku-os,dc=org
=======================================
--- /dev/null
+++ /haikudepotserver-rpm-common/src/main/resources/initd__haikudepotserver
Fri Sep 26 09:53:20 2014 UTC
@@ -0,0 +1,94 @@
+#!/bin/bash
+#
+# This script is for starting and stopping the
haikudepotserver${rpm.variant} service.
+#
+# chkconfig: 345 80 20
+#
+### BEGIN INIT INFO
+# Provides: haikudepotserver${rpm.variant}
+# Required-Start: $network $syslog
+# Required-Stop: $network $syslog
+# Default-Start:
+# Default-Stop:
+# Description: Haiku Depot Server
+# Short-Description: start and stop haikudepotserver${rpm.variant}
+### END INIT INFO
+
+HDS_CONFIGBASE=/etc/haikudepotserver${rpm.variant}
+HDS_HOME=/opt/haikudepotserver${rpm.variant}
+HDS_LOGFILE=/var/log/haikudepotserver${rpm.variant}/haikudepotserver${rpm.variant}.log
+HDS_PSIDENTIFIER=haikudepotserver${rpm.variant}-3D84A80C-38A4-40BC-9AEE-86C3CA986517
+
+MAXSHUTDOWNDELAYSECONDS=20
+
+JAVA_HOME=/usr/lib/jvm/jre
+JAVA_OPTS="-Dfile.encoding=UTF-8 \
+-Duser.timezone=GMT0 \
+-Xms512m -Xmx640m \
+-Djava.awt.headless=true \
+-Dconfig.properties=file://${HDS_CONFIGBASE}/config.properties \
+-jar ${HDS_HOME}/haikudepotserver-webapp-exec-war.jar \
+-resetExtract \
+-httpPort ${rpm.http.port} \
+-extractDirectory /var/cache/haikudepotserver${rpm.variant}/extract"
+
+haikudepotserver_pid() {
+ echo `ps aux | grep "${HDS_PSIDENTIFIER}" | grep -v grep | awk '{ print
$2 }'`
+}
+
+start() {
+ pid="$(haikudepotserver_pid)"
+ if [ -n "$pid" ]; then
+ echo "haikudepotserver${rpm.variant}; is already running (pid: $pid)"
+ else
+ echo "haikudepotserver${rpm.variant}; starting..."
+ /bin/su -s /bin/bash haikudepotserver${rpm.variant}
-c "${JAVA_HOME}/bin/java ${JAVA_OPTS}
-Dcommand.identifier=${HDS_PSIDENTIFIER} 2>&1 | tee -a ${HDS_LOGFILE} >
/dev/null &"
+ fi
+ return 0
+}
+
+stop() {
+ pid="$(haikudepotserver_pid)"
+ if [ -n "$pid" ]; then
+ echo "haikudepotserver${rpm.variant}; stopping... (pid: $pid)"
+ kill "$pid"
+
+ count=0;
+ while [[ -n "$(haikudepotserver_pid)" && ("$count"
-lt "${MAXSHUTDOWNDELAYSECONDS}") ]]; do
+ sleep 1
+ let count+=1
+ done;
+
+ if [[ -n "$(haikudepotserver_pid)" ]]; then
+ echo "haikudepotserver${rpm.variant}; unable to be stopped"
+ else
+ echo "haikudepotserver${rpm.variant}; stopped"
+ fi
+ else
+ echo "haikudepotserver${rpm.variant}; not running"
+ fi
+ return 0
+}
+
+case $1 in
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ restart)
+ stop
+ start
+ ;;
+ status)
+ pid="$(haikudepotserver_pid)"
+ if [ -n "$pid" ]; then
+ echo "haikudepotserver${rpm.variant}; running (pid: $pid)"
+ else
+ echo "haikudepotserver; not running"
+ fi
+ ;;
+esac
+
+exit 0
=======================================
--- /dev/null
+++ /haikudepotserver-rpm-common/src/main/resources/logging__logback.xml
Fri Sep 26 09:53:20 2014 UTC
@@ -0,0 +1,18 @@
+<configuration>
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <!-- encoders are assigned the type
+ ch.qos.logback.classic.encoder.PatternLayoutEncoder by
default -->
+ <encoder>
+ <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36}
- %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <logger name="org.apache.cayenne" level="warn"/>
+ <logger name="com.googlecode.flyway" level="debug"/>
+
+ <root level="info">
+ <appender-ref ref="STDOUT" />
+ </root>
+
+</configuration>
=======================================
--- /dev/null
+++
/haikudepotserver-rpm-common/src/main/resources/logrotate__haikudepotserver
Fri Sep 26 09:53:20 2014 UTC
@@ -0,0 +1,7 @@
+/var/log/haikudepotserver${rpm.variant}/haikudepotserver${rpm.variant}.log
{
+ rotate 20
+ size 10M
+ compress
+ su haikudepotserver${rpm.variant} haikudepotserver${rpm.variant}
+ copytruncate
+}
=======================================
--- /dev/null
+++ /haikudepotserver-rpm-parent/pom.xml Fri Sep 26 09:53:20 2014 UTC
@@ -0,0 +1,211 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<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";>
+
+ <parent>
+ <artifactId>haikudepotserver-parent</artifactId>
+ <groupId>org.haikuos</groupId>
+ <relativePath>../haikudepotserver-parent</relativePath>
+ <version>1.0.7-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>haikudepotserver-rpm-parent</artifactId>
+ <packaging>pom</packaging>
+ <description>
+ This project provides the rules and instructions for the RPM
assembly. Specific RPM-assembly projects
+ use this as a parent and simply replace variables that control the
configuration of the variant.
+ </description>
+
+ <!--
+ These are placeholder variables that are overriden in the concrete
RPM-assembly projects.
+ -->
+
+ <properties>
+ <rpm.variant>-invalid</rpm.variant>
+ <rpm.http.port>invalid</rpm.http.port>
+ </properties>
+
+ <build>
+
+
<finalName>haikudepotserver${rpm.variant}-${project.version}.rpm</finalName>
+
+ <plugins>
+
+ <!--
+ This plugin will extract the bundled shared resources and will
unpack them prior to the RPM assembly
+ process. Note that filtering is disabled here so that the
filtering of certain resources can be
+ undertaken as a last step in the RPM assembly.
+ -->
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.5</version>
+ <configuration>
+ <resourceBundles>
+
<resourceBundle>${project.groupId}:haikudepotserver-rpm-common:${project.version}</resourceBundle>
+ </resourceBundles>
+
<useDefaultFilterDelimiters>false</useDefaultFilterDelimiters>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rpm-maven-plugin</artifactId>
+ <version>2.1-alpha-4</version>
+ <extensions>true</extensions>
+ <configuration>
+ <name>haikudepotserver${rpm.variant}</name>
+ <group>haikuos</group>
+ <packager>haikuos</packager>
+ <version>${project.version}</version>
+ <copyright>MIT</copyright>
+ <defineStatements>
+ <defineStatement>_unpackaged_files_terminate_build
0</defineStatement>
+ </defineStatements>
+
+ <preinstallScriptlet>
+ <script>
+/usr/bin/getent group haikudepotserver${rpm.variant} || groupadd -r
haikudepotserver${rpm.variant} >> /dev/null
+/usr/bin/getent passwd haikudepotserver${rpm.variant} || useradd -r -g
haikudepotserver${rpm.variant} -s /sbin/nologin
haikudepotserver${rpm.variant} >> /dev/null
+ </script>
+ </preinstallScriptlet>
+
+ <mappings>
+
+ <mapping>
+
<directory>/etc/haikudepotserver${rpm.variant}</directory>
+ <filemode>770</filemode>
+
<username>haikudepotserver${rpm.variant}</username>
+
<groupname>haikudepotserver${rpm.variant}</groupname>
+ </mapping>
+
+ <mapping>
+
<directory>/etc/haikudepotserver${rpm.variant}</directory>
+ <directoryIncluded>false</directoryIncluded>
+ <filemode>660</filemode>
+ <configuration>noreplace</configuration>
+
<username>haikudepotserver${rpm.variant}</username>
+
<groupname>haikudepotserver${rpm.variant}</groupname>
+ <sources>
+ <source>
+
<location>${project.build.directory}/maven-shared-archive-resources/config__config.properties</location>
+
<destination>config.properties</destination>
+ <filter>true</filter>
+ </source>
+ <source>
+
<location>${project.build.directory}/maven-shared-archive-resources/logging__logback.xml</location>
+ <destination>logback.xml</destination>
+ <filter>true</filter>
+ </source>
+ </sources>
+ </mapping>
+
+ <mapping>
+ <directory>/etc/logrotate.d</directory>
+ <directoryIncluded>false</directoryIncluded>
+ <filemode>644</filemode>
+ <username>root</username>
+ <groupname>root</groupname>
+ <sources>
+ <source>
+
<location>${project.build.directory}/maven-shared-archive-resources/logrotate__haikudepotserver</location>
+
<destination>haikudepotserver${rpm.variant}</destination>
+ <filter>true</filter>
+ </source>
+ </sources>
+ </mapping>
+
+ <mapping>
+ <directory>/etc/init.d</directory>
+ <directoryIncluded>false</directoryIncluded>
+ <filemode>700</filemode>
+ <username>root</username>
+ <groupname>root</groupname>
+ <sources>
+ <source>
+
<location>${project.build.directory}/maven-shared-archive-resources/initd__haikudepotserver</location>
+
<destination>haikudepotserver${rpm.variant}</destination>
+ <filter>true</filter>
+ </source>
+ </sources>
+ </mapping>
+
+ <mapping>
+
<directory>/opt/haikudepotserver${rpm.variant}</directory>
+ <filemode>770</filemode>
+
<username>haikudepotserver${rpm.variant}</username>
+
<groupname>haikudepotserver${rpm.variant}</groupname>
+ </mapping>
+
+ <mapping>
+
<directory>/opt/haikudepotserver${rpm.variant}</directory>
+ <directoryIncluded>false</directoryIncluded>
+ <filemode>660</filemode>
+
<username>haikudepotserver${rpm.variant}</username>
+
<groupname>haikudepotserver${rpm.variant}</groupname>
+ <dependency>
+ <includes>
+
<include>org.haikuos:haikudepotserver-webapp</include>
+ </includes>
+ <stripVersion>true</stripVersion>
+ </dependency>
+ </mapping>
+
+ <mapping>
+
<directory>/var/cache/haikudepotserver${rpm.variant}</directory>
+ <filemode>770</filemode>
+
<username>haikudepotserver${rpm.variant}</username>
+
<groupname>haikudepotserver${rpm.variant}</groupname>
+ </mapping>
+
+ <mapping>
+
<directory>/var/log/haikudepotserver${rpm.variant}</directory>
+ <filemode>770</filemode>
+
<username>haikudepotserver${rpm.variant}</username>
+
<groupname>haikudepotserver${rpm.variant}</groupname>
+ </mapping>
+
+ </mappings>
+
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>haikudepotserver-webapp</artifactId>
+ <version>${project.version}</version>
+ <classifier>exec-war</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!--
+ This will bring in the shared resources for the RPM assembly.
+ -->
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>haikudepotserver-rpm-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ </dependencies>
+
+</project>
=======================================
--- /dev/null
+++ /haikudepotserver-rpm-production/pom.xml Fri Sep 26 09:53:20 2014 UTC
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<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";>
+
+ <parent>
+ <artifactId>haikudepotserver-rpm-parent</artifactId>
+ <groupId>org.haikuos</groupId>
+ <relativePath>../haikudepotserver-rpm-parent</relativePath>
+ <version>1.0.7-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>haikudepotserver-rpm-production</artifactId>
+ <packaging>rpm</packaging>
+ <description>
+ This project will assemble an RPM for the production deployment of
the haikudepotserver system. The
+ parent POM controls the assembly process.
+ </description>
+
+ <properties>
+ <rpm.variant></rpm.variant> <!-- intentional missing value -->
+ <rpm.http.port>8801</rpm.http.port>
+ </properties>
+
+</project>
=======================================
--- /dev/null
+++ /haikudepotserver-rpm-test/pom.xml Fri Sep 26 09:53:20 2014 UTC
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<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";>
+
+ <parent>
+ <artifactId>haikudepotserver-rpm-parent</artifactId>
+ <groupId>org.haikuos</groupId>
+ <relativePath>../haikudepotserver-rpm-parent</relativePath>
+ <version>1.0.7-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>haikudepotserver-rpm-test</artifactId>
+ <packaging>rpm</packaging>
+ <description>
+ This project will assemble an RPM for the production deployment of
the haikudepotserver system. The
+ parent POM controls the assembly process.
+ </description>
+
+ <properties>
+ <rpm.variant>-test</rpm.variant>
+ <rpm.http.port>8701</rpm.http.port>
+ </properties>
+
+</project>
=======================================
--- /haikudepotserver-rpm/pom.xml Mon Sep 22 11:08:14 2014 UTC
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<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";>
-
- <parent>
- <artifactId>haikudepotserver-parent</artifactId>
- <groupId>org.haikuos</groupId>
- <relativePath>../haikudepotserver-parent</relativePath>
- <version>1.0.7-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>haikudepotserver-rpm</artifactId>
- <packaging>rpm</packaging>
-
- <build>
-
- <finalName>haikudepotserver-${project.version}.rpm</finalName>
-
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rpm-maven-plugin</artifactId>
- <version>2.1-alpha-4</version>
- <extensions>true</extensions>
- <configuration>
- <name>haikudepotserver</name>
- <group>haikuos</group>
- <packager>haikuos</packager>
- <version>${project.version}</version>
- <copyright>MIT</copyright>
- <defineStatements>
- <defineStatement>_unpackaged_files_terminate_build
0</defineStatement>
- </defineStatements>
-
- <preinstallScriptlet>
- <script>
-/usr/bin/getent group haikudepotserver || groupadd -r haikudepotserver
>> /dev/null
-/usr/bin/getent passwd haikudepotserver || useradd -r -g haikudepotserver
-s /sbin/nologin haikudepotserver >> /dev/null
- </script>
- </preinstallScriptlet>
-
- <mappings>
-
- <mapping>
- <directory>/etc/haikudepotserver</directory>
- <filemode>770</filemode>
- <username>haikudepotserver</username>
- <groupname>haikudepotserver</groupname>
- </mapping>
-
- <mapping>
- <directory>/etc/haikudepotserver</directory>
- <directoryIncluded>false</directoryIncluded>
- <filemode>660</filemode>
- <configuration>noreplace</configuration>
- <username>haikudepotserver</username>
- <groupname>haikudepotserver</groupname>
- <sources>
- <source>
-
<location>src/main/etc/config__config.properties</location>
-
<destination>config.properties</destination>
- </source>
- <source>
-
<location>src/main/etc/logging__logback.xml</location>
- <destination>logback.xml</destination>
- </source>
- </sources>
- </mapping>
-
- <mapping>
- <directory>/etc/logrotate.d</directory>
- <directoryIncluded>false</directoryIncluded>
- <filemode>644</filemode>
- <username>root</username>
- <groupname>root</groupname>
- <sources>
- <source>
-
<location>src/main/etc/logrotate__haikudepotserver</location>
-
<destination>haikudepotserver</destination>
- </source>
- </sources>
- </mapping>
-
- <mapping>
- <directory>/etc/init.d</directory>
- <directoryIncluded>false</directoryIncluded>
- <filemode>700</filemode>
- <username>root</username>
- <groupname>root</groupname>
- <sources>
- <source>
-
<location>src/main/etc/initd__haikudepotserver</location>
-
<destination>haikudepotserver</destination>
- </source>
- </sources>
- </mapping>
-
- <mapping>
- <directory>/opt/haikudepotserver</directory>
- <filemode>770</filemode>
- <username>haikudepotserver</username>
- <groupname>haikudepotserver</groupname>
- </mapping>
-
- <mapping>
- <directory>/opt/haikudepotserver</directory>
- <directoryIncluded>false</directoryIncluded>
- <filemode>660</filemode>
- <username>haikudepotserver</username>
- <groupname>haikudepotserver</groupname>
- <dependency>
- <includes>
-
<include>org.haikuos:haikudepotserver-webapp</include>
- </includes>
- <stripVersion>true</stripVersion>
- </dependency>
- </mapping>
-
- <mapping>
-
<directory>/var/cache/haikudepotserver</directory>
- <filemode>770</filemode>
- <username>haikudepotserver</username>
- <groupname>haikudepotserver</groupname>
- </mapping>
-
- <mapping>
-
<directory>/var/log/haikudepotserver</directory>
- <filemode>770</filemode>
- <username>haikudepotserver</username>
- <groupname>haikudepotserver</groupname>
- </mapping>
-
- </mappings>
-
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
-
- <dependency>
- <groupId>org.haikuos</groupId>
- <artifactId>haikudepotserver-webapp</artifactId>
- <version>${project.version}</version>
- <classifier>exec-war</classifier>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- </dependencies>
-
-</project>
=======================================
--- /haikudepotserver-rpm/src/main/etc/config__config.properties Mon Sep 15
10:09:53 2014 UTC
+++ /dev/null
@@ -1,105 +0,0 @@
-# ===========================================
-# haikudepotserver - configuration file
-# ===========================================
-
-# -------------------------------------------
-# general
-
-pkgversion.viewcounter.protectrecurringincrementfromsameclient=true
-
-# -------------------------------------------
-# database connection
-
-jdbc.driver=org.postgresql.Driver
-jdbc.url=jdbc:postgresql://localhost:5432/haikudepotserver
-jdbc.username=haikudepotserver
-jdbc.password=haikudepotserver
-
-flyway.migrate=true
-
-# -------------------------------------------
-# user ratings
-
-# How many versions to go back from the latest version in order
-# to find user ratings to aggregate.
-
-userrating.aggregation.pkg.versionsback=2
-
-# How many ratings must be present before an aggregate can be
-# derived; too few and the result will be from too small a sample
-# to be meaningful.
-
-userrating.aggregation.pkg.minratings=3
-
-# -------------------------------------------
-# web infrastructure
-
-# This value relates to the built-in JAWR web-resource compression and
-# concatination system. Review the JAWR documentation for details on
-# the effects of configuring this value to true.
-
-#jawr.debug.on=false
-
-# This URL provides a base URL that the application can then add to when
-# it formulates URLs that are to be used outside of the application; for
-# example, URLs in ATOM feeds etc...
-
-baseurl=https://doesnotexist.haiku-os.org:8080/
-
-# -------------------------------------------
-# web security
-
-# This is the number of seconds for which an authentication token is
-# valid for.
-
-#authentication.jws.expiryseconds=
-
-# This secret is used to sign the tokens used to communicate between
-# the client and the server. This value should be very hard to guess.
-# The output of the command "uuidgen" would be appropriate. This
-# value must be kept secret and not disclosed in public.
-# commented out to force the value to be considered
-
-#authentication.jws.sharedkey=
-
-# This value is used in the production and consumption of the tokens
-# between the client and the server. It is intended that this is
-# consistent for a given deployment. Sample values that may be
-# appropriate;
-#
-# dev.hds
-# prod.hds
-# staging.hds
-# testing.hds
-#
-# commented out to force the value to be considered
-
-#authentication.jws.issuer=
-
-# -------------------------------------------
-# email-related
-
-smtp.host=localhost
-#smtp.port=2525
-#smtp.username=
-#smtp.password=
-#smtp.auth=false
-#smtp.starttls=false
-email.from=noreply@xxxxxxxxxxxx
-
-# -------------------------------------------
-# == NOT READY TO BE USED ==
-# LDAP related
-# If the LDAP setting are commented-out then the system will operate as if
-# there were no LDAP server and will not attempt to synchronize user data
-# to the LDAP directory server.
-
-#ldap.host=localhost
-#ldap.port=10389
-#ldap.user.dn=cn=haikudepotserver,ou=services,dc=haiku-os,dc=org
-#ldap.password=Pa55word2
-
-# This setting provides the location in the LDAP directory where the users
-# of the system are stored.
-
-#ldap.people.dn=ou=people,dc=haiku-os,dc=org
=======================================
--- /haikudepotserver-rpm/src/main/etc/initd__haikudepotserver Wed Jan 29
10:34:56 2014 UTC
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/bash
-#
-# This script is for starting and stopping the haikudepotserver service.
-#
-# chkconfig: 345 80 20
-#
-### BEGIN INIT INFO
-# Provides: haikudepotserver
-# Required-Start: $network $syslog
-# Required-Stop: $network $syslog
-# Default-Start:
-# Default-Stop:
-# Description: Haiku Depot Server
-# Short-Description: start and stop haikudepotserver
-### END INIT INFO
-
-HDS_CONFIGBASE=/etc/haikudepotserver
-HDS_HOME=/opt/haikudepotserver
-HDS_LOGFILE=/var/log/haikudepotserver/haikudepotserver.log
-HDS_PSIDENTIFIER=haikudepotserver-6B03C28C-4AF1-450E-909D-2E623B571F93
-
-MAXSHUTDOWNDELAYSECONDS=20
-
-JAVA_HOME=/usr/lib/jvm/jre
-JAVA_OPTS="-Dfile.encoding=UTF-8 \
--Duser.timezone=GMT0 \
--Xms512m -Xmx640m \
--Djava.awt.headless=true \
--Dconfig.properties=file://${HDS_CONFIGBASE}/config.properties \
--jar ${HDS_HOME}/haikudepotserver-webapp-exec-war.jar \
--resetExtract \
--extractDirectory /var/cache/haikudepotserver/extract"
-
-haikudepotserver_pid() {
- echo `ps aux | grep "${HDS_PSIDENTIFIER}" | grep -v grep | awk '{ print
$2 }'`
-}
-
-start() {
- pid="$(haikudepotserver_pid)"
- if [ -n "$pid" ]; then
- echo "haikudepotserver; is already running (pid: $pid)"
- else
- echo "haikudepotserver; starting..."
- /bin/su -s /bin/bash haikudepotserver -c "${JAVA_HOME}/bin/java
${JAVA_OPTS} -Dcommand.identifier=${HDS_PSIDENTIFIER} 2>&1 | tee -a
${HDS_LOGFILE} > /dev/null &"
- fi
- return 0
-}
-
-stop() {
- pid="$(haikudepotserver_pid)"
- if [ -n "$pid" ]; then
- echo "haikudepotserver; stopping... (pid: $pid)"
- kill "$pid"
-
- count=0;
- while [[ -n "$(haikudepotserver_pid)" && ("$count"
-lt "${MAXSHUTDOWNDELAYSECONDS}") ]]; do
- sleep 1
- let count+=1
- done;
-
- if [[ -n "$(haikudepotserver_pid)" ]]; then
- echo "haikudepotserver; unable to be stopped"
- else
- echo "haikudepotserver; stopped"
- fi
- else
- echo "haikudepotserver; not running"
- fi
- return 0
-}
-
-case $1 in
- start)
- start
- ;;
- stop)
- stop
- ;;
- restart)
- stop
- start
- ;;
- status)
- pid="$(haikudepotserver_pid)"
- if [ -n "$pid" ]; then
- echo "haikudepotserver; running (pid: $pid)"
- else
- echo "haikudepotserver; not running"
- fi
- ;;
-esac
-
-exit 0
=======================================
--- /haikudepotserver-rpm/src/main/etc/logging__logback.xml Mon Jan 27
08:59:15 2014 UTC
+++ /dev/null
@@ -1,18 +0,0 @@
-<configuration>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <!-- encoders are assigned the type
- ch.qos.logback.classic.encoder.PatternLayoutEncoder by
default -->
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36}
- %msg%n</pattern>
- </encoder>
- </appender>
-
- <logger name="org.apache.cayenne" level="warn"/>
- <logger name="com.googlecode.flyway" level="debug"/>
-
- <root level="info">
- <appender-ref ref="STDOUT" />
- </root>
-
-</configuration>
=======================================
--- /haikudepotserver-rpm/src/main/etc/logrotate__haikudepotserver Sat May
24 11:47:09 2014 UTC
+++ /dev/null
@@ -1,7 +0,0 @@
-/var/log/haikudepotserver/haikudepotserver.log {
- rotate 20
- size 10M
- compress
- su haikudepotserver haikudepotserver
- copytruncate
-}
=======================================
---
/haikudepotserver-webapp/src/main/java/org/haikuos/haikudepotserver/multipage/controller/HomeController.java
Wed Sep 3 09:55:22 2014 UTC
+++
/haikudepotserver-webapp/src/main/java/org/haikuos/haikudepotserver/multipage/controller/HomeController.java
Fri Sep 26 09:53:20 2014 UTC
@@ -196,7 +196,10 @@
data.setSearchExpression(searchExpression);
data.setPkgVersions(pkgVersions);
- data.setPagination(new Pagination(totalPkgVersions.intValue(),
offset, PAGESIZE));
+
+ if(0!=totalPkgVersions.intValue()) {
+ data.setPagination(new Pagination(totalPkgVersions.intValue(),
offset, PAGESIZE));
+ }
ModelAndView result = new ModelAndView("multipage/home");
result.addObject("data", data);
=======================================
--- /pom.xml Mon Sep 22 11:08:14 2014 UTC
+++ /pom.xml Fri Sep 26 09:53:20 2014 UTC
@@ -28,7 +28,10 @@
</activation>
<modules>
- <module>haikudepotserver-rpm</module>
+ <module>haikudepotserver-rpm-production</module>
+ <module>haikudepotserver-rpm-common</module>
+ <module>haikudepotserver-rpm-parent</module>
+ <module>haikudepotserver-rpm-test</module>
</modules>
</profile>
=======================================
--- /setversion.py Mon Sep 22 11:05:52 2014 UTC
+++ /setversion.py Fri Sep 26 09:53:20 2014 UTC
@@ -140,7 +140,7 @@
print "the 'pom.xml' for module "+modulename+" should be
accessible"
sys.exit(1)
- if modulename.endswith("-parent"):
+ if modulename == "haikudepotserver-parent":
actualversion = pomtoplevelelement(modulepomtree, "version").text
if actualversion != expectedversion:
==============================================================================
Revision: 0515941570fc
Author: Andrew Lindesay <apl@xxxxxxxxxxxxxx>
Date: Fri Sep 26 10:55:41 2014 UTC
Log: updated documentation related to the RPM assembly
https://code.google.com/p/haiku-depot-web-app/source/detail?r=0515941570fc
Added:
/haikudepotserver-docs/src/main/latex/docs/img-rpm-package-assembly-diagram.pdf
Modified:
/haikudepotserver-docs/src/main/latex/docs/part-deployment.tex
=======================================
--- /dev/null
+++
/haikudepotserver-docs/src/main/latex/docs/img-rpm-package-assembly-diagram.pdf
Fri Sep 26 10:55:41 2014 UTC
Binary file, no diff available.
=======================================
--- /haikudepotserver-docs/src/main/latex/docs/part-deployment.tex Sun Aug
3 11:11:48 2014 UTC
+++ /haikudepotserver-docs/src/main/latex/docs/part-deployment.tex Fri Sep
26 10:55:41 2014 UTC
@@ -62,19 +62,32 @@
\subsection{Deployment with RPM}
-The build system, when executed on a linux host, will produce an RPM
deployment file containing the resources necessary for the system to be
installed onto an RPM-based linux system. This RPM does not have any
dependencies and so both java and Postgres database server will need to be
installed before the application server can be successfully started --- see
\ref{prerequisites}. The RPM is built under the {\tt haikudepotserver-rpm}
module and can be found at this path from that module;
+The build system, when executed on a linux host, will produce RPMs that
can be deployed into an RPM-based linux system. The RPMs do not have any
dependencies and so both java and Postgres database server will need to be
installed before the application server can be successfully started --- see
\ref{prerequisites}. Two RPMs are built;
-\framebox{\tt ../target/rpm/haikudepotserver/RPMS/noarch/}
+\begin{tabular}{|l|l|l|}
+\hline
+Variant & Project & HTTP Port \\
+\hline
+Production & {\tt haikudepotserver-rpm-production} & 8801 \\
+Test & {\tt haikudepotserver-rpm-test} & 8701 \\
+\hline
+\end{tabular}
+
+The production variant has names and paths that are simply ``{\tt
haikudepotserver}'' whereas the test variant has names and paths that are
of the form ``{\tt haikudepotserver-test}''. In the instructions that
follow, the test variant has been indicated by a colored suffix
``{\tt\color{magenta} -test}''.
+
+The RPM is built with the ``package'' maven goal. The RPM build product
can be found at this path from that module;
+
+\framebox{\tt ../target/rpm/haikudepotserver{\color{magenta}
-test}/RPMS/noarch/}
\subsubsection{Installing}
The RPM can be installed with the following command making an obvious
reference to the RPM file.
-\framebox{\tt rpm -ivh haikudepotserver-1.0.2.rpm}
+\framebox{\tt rpm -ivh haikudepotserver{\color{magenta} -test}-1.0.2.rpm}
The RPM can be uninstalled with the following command;
-\framebox{\tt rpm -e haikudepotserver}
+\framebox{\tt rpm -e haikudepotserver{\color{magenta} -test}}
It would be prudent to first ensure that the application server is not
running before uninstalling it.
@@ -84,12 +97,14 @@
\begin{tabular}{|l|l|}
\hline
-{\tt /var/log/haikudepotserver/..} & Log files from the application server
\\
-{\tt /opt/haikudepotserver/..} & Application server binary resources \\
-{\tt /var/cache/haikudepotserver/..} & Operational files for the
application server \\
-{\tt /etc/haikudepotserver/..} & Configuration files \\
+Location & Description \\
+\hline
+{\tt /var/log/haikudepotserver{\color{magenta} -test}/..} & Log files from
the application server \\
+{\tt /opt/haikudepotserver{\color{magenta} -test}/..} & Application server
binary resources \\
+{\tt /var/cache/haikudepotserver{\color{magenta} -test}/..} & Operational
files for the application server \\
+{\tt /etc/haikudepotserver{\color{magenta} -test}/..} & Configuration
files \\
{\tt /etc/logrotate.d/..} & Log rotation configuration \\
-{\tt /etc/init.d/haikudepotserver} & Start and stop script \\
+{\tt /etc/init.d/haikudepotserver{\color{magenta} -test}} & Start and stop
script \\
\hline
\end{tabular}
@@ -97,18 +112,34 @@
The installed application server can be started with the following
command, referencing the RPM file;
-\framebox{\tt service haikudepotserver start}
+\framebox{\tt service haikudepotserver{\color{magenta} -test} start}
The installed application server can be stopped with the following command;
-\framebox{\tt service haikudepotserver stop}
+\framebox{\tt service haikudepotserver{\color{magenta} -test} stop}
\subsubsection{Automatic Startup and Shutdown}
The installed application server can be configured to startup
automatically using the following command;
-\framebox{\tt chkconfig --add haikudepotserver}
+\framebox{\tt chkconfig --add haikudepotserver{\color{magenta} -test}}
The installed application can later be prevented from automatic startup
using the following command;
-\framebox{\tt chkconfig --del haikudepotserver}
+\framebox{\tt chkconfig --del haikudepotserver{\color{magenta} -test}}
+
+\subsubsection{RPM Assembly / Maven}
+
+\begin{figure}
+\centering
+\vspace{.2in}
+\includegraphics[width=6.5in]{img-rpm-package-assembly-diagram.pdf}
+\caption{The maven modules that are related to the RPM assembly process
and how they inter-relate.}
+\label{\thefigure}
+\end{figure}
+
+There are a number of inter-related maven modules that work together to
generate the RPMs. These are shown in figure {\thefigure}. The blue lines
show module inheritance. An ``reactor POM'' (not shown here) will prevent
the RPM from being assembled unless the build system is on a linux host.
It does this by using a maven profile that is triggered by the operating
system type.
+
+The module {\tt haikudepotserver-rpm-common} provides (purple line)
resources for the RPM assembly that are common to the variants (production
and test). This means that the same resources will assemble both
variants. Note that the resources are intended to be {\it filtered} in the
RPM assembly process so they contain token-replacement strings such as {\tt
\$\{rpm.variant\}}. The filtering occurs late in the RPM assembly
process. These resources are unpacked in both of the RPM assembly modules
{\tt haikudepotserver-rpm-production} and {\tt haikudepotserver-rpm-test}.
+
+Both of the RPM assembly modules have {\tt haikudepotserver-rpm-parent} as
a parent and this parent has the configuration (using a maven plugin called
{\tt rpm-maven-plugin}) for the assembly so that the configuration of the
assembly is shared between the two assembly modules. The {\tt
haikudepotserver-rpm-parent} also introduces a dependency (red line) on the
{\tt haikudepotserver-webapp} module in order that the web application
build-product can be included in the RPMs.
==============================================================================
Revision: 2dd9d056d09d
Author: Andrew Lindesay <apl@xxxxxxxxxxxxxx>
Date: Fri Sep 26 11:05:06 2014 UTC
Log: modified build version script for rpm assembly changes
https://code.google.com/p/haiku-depot-web-app/source/detail?r=2dd9d056d09d
Modified:
/setversion.py
=======================================
--- /setversion.py Fri Sep 26 09:53:20 2014 UTC
+++ /setversion.py Fri Sep 26 11:05:06 2014 UTC
@@ -175,7 +175,7 @@
print "the 'pom.xml' for module "+modulename+" should be
accessible"
sys.exit(1)
- if modulename.endswith("-parent"):
+ if modulename == "haikudepotserver-parent":
versione = pomtoplevelelement(modulepomtree, "version")
versione.text = version
else:
==============================================================================
Revision: 62ef871579f1
Author: Andrew Lindesay <apl@xxxxxxxxxxxxxx>
Date: Fri Sep 26 11:07:26 2014 UTC
Log: version 1.0.7
https://code.google.com/p/haiku-depot-web-app/source/detail?r=62ef871579f1
Modified:
/haikudepotserver-api1/pom.xml
/haikudepotserver-docs/pom.xml
/haikudepotserver-packagefile/pom.xml
/haikudepotserver-parent/pom.xml
/haikudepotserver-rpm-common/pom.xml
/haikudepotserver-rpm-parent/pom.xml
/haikudepotserver-rpm-production/pom.xml
/haikudepotserver-rpm-test/pom.xml
/haikudepotserver-webapp/pom.xml
/pom.xml
=======================================
--- /haikudepotserver-api1/pom.xml Mon Sep 22 11:08:14 2014 UTC
+++ /haikudepotserver-api1/pom.xml Fri Sep 26 11:07:26 2014 UTC
@@ -5,7 +5,7 @@
<artifactId>haikudepotserver-parent</artifactId>
<groupId>org.haikuos</groupId>
<relativePath>../haikudepotserver-parent</relativePath>
- <version>1.0.7-SNAPSHOT</version>
+ <version>1.0.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
=======================================
--- /haikudepotserver-docs/pom.xml Mon Sep 22 11:08:14 2014 UTC
+++ /haikudepotserver-docs/pom.xml Fri Sep 26 11:07:26 2014 UTC
@@ -5,7 +5,7 @@
<artifactId>haikudepotserver-parent</artifactId>
<groupId>org.haikuos</groupId>
<relativePath>../haikudepotserver-parent</relativePath>
- <version>1.0.7-SNAPSHOT</version>
+ <version>1.0.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
=======================================
--- /haikudepotserver-packagefile/pom.xml Mon Sep 22 11:08:14 2014 UTC
+++ /haikudepotserver-packagefile/pom.xml Fri Sep 26 11:07:26 2014 UTC
@@ -5,7 +5,7 @@
<artifactId>haikudepotserver-parent</artifactId>
<groupId>org.haikuos</groupId>
<relativePath>../haikudepotserver-parent</relativePath>
- <version>1.0.7-SNAPSHOT</version>
+ <version>1.0.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
=======================================
--- /haikudepotserver-parent/pom.xml Mon Sep 22 11:08:14 2014 UTC
+++ /haikudepotserver-parent/pom.xml Fri Sep 26 11:07:26 2014 UTC
@@ -5,7 +5,7 @@
<groupId>org.haikuos</groupId>
<artifactId>haikudepotserver-parent</artifactId>
<packaging>pom</packaging>
- <version>1.0.7-SNAPSHOT</version>
+ <version>1.0.7</version>
<licenses>
<license>
=======================================
--- /haikudepotserver-rpm-common/pom.xml Fri Sep 26 09:53:20 2014 UTC
+++ /haikudepotserver-rpm-common/pom.xml Fri Sep 26 11:07:26 2014 UTC
@@ -5,7 +5,7 @@
<artifactId>haikudepotserver-parent</artifactId>
<groupId>org.haikuos</groupId>
<relativePath>../haikudepotserver-parent</relativePath>
- <version>1.0.7-SNAPSHOT</version>
+ <version>1.0.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -18,11 +18,7 @@
<build>
- <!--
- This will prevent the resources from being filtered in the
bundling process so that they can
- be filtered (have variables replaced) when they are unbundled
ready for inclusion in the
- RPM.
- -->
+
<resources>
<resource>
@@ -36,11 +32,7 @@
<plugins>
- <!--
- This will create a bundle that can be (re)used in assembly of
the various RPMs such as
- production and test. Note that again, the filtering is
disabled in order to ensure that
- the raw resources can then be filtered in the unpacking
process.
- -->
+
<plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
=======================================
--- /haikudepotserver-rpm-parent/pom.xml Fri Sep 26 09:53:20 2014 UTC
+++ /haikudepotserver-rpm-parent/pom.xml Fri Sep 26 11:07:26 2014 UTC
@@ -5,7 +5,7 @@
<artifactId>haikudepotserver-parent</artifactId>
<groupId>org.haikuos</groupId>
<relativePath>../haikudepotserver-parent</relativePath>
- <version>1.0.7-SNAPSHOT</version>
+ <version>1.0.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -16,9 +16,7 @@
use this as a parent and simply replace variables that control the
configuration of the variant.
</description>
- <!--
- These are placeholder variables that are overriden in the concrete
RPM-assembly projects.
- -->
+
<properties>
<rpm.variant>-invalid</rpm.variant>
@@ -31,11 +29,7 @@
<plugins>
- <!--
- This plugin will extract the bundled shared resources and will
unpack them prior to the RPM assembly
- process. Note that filtering is disabled here so that the
filtering of certain resources can be
- undertaken as a last step in the RPM assembly.
- -->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -196,9 +190,7 @@
</exclusions>
</dependency>
- <!--
- This will bring in the shared resources for the RPM assembly.
- -->
+
<dependency>
<groupId>${project.groupId}</groupId>
=======================================
--- /haikudepotserver-rpm-production/pom.xml Fri Sep 26 09:53:20 2014 UTC
+++ /haikudepotserver-rpm-production/pom.xml Fri Sep 26 11:07:26 2014 UTC
@@ -5,7 +5,7 @@
<artifactId>haikudepotserver-rpm-parent</artifactId>
<groupId>org.haikuos</groupId>
<relativePath>../haikudepotserver-rpm-parent</relativePath>
- <version>1.0.7-SNAPSHOT</version>
+ <version>1.0.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -17,7 +17,7 @@
</description>
<properties>
- <rpm.variant></rpm.variant> <!-- intentional missing value -->
+ <rpm.variant />
<rpm.http.port>8801</rpm.http.port>
</properties>
=======================================
--- /haikudepotserver-rpm-test/pom.xml Fri Sep 26 09:53:20 2014 UTC
+++ /haikudepotserver-rpm-test/pom.xml Fri Sep 26 11:07:26 2014 UTC
@@ -5,7 +5,7 @@
<artifactId>haikudepotserver-rpm-parent</artifactId>
<groupId>org.haikuos</groupId>
<relativePath>../haikudepotserver-rpm-parent</relativePath>
- <version>1.0.7-SNAPSHOT</version>
+ <version>1.0.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
=======================================
--- /haikudepotserver-webapp/pom.xml Mon Sep 22 11:08:14 2014 UTC
+++ /haikudepotserver-webapp/pom.xml Fri Sep 26 11:07:26 2014 UTC
@@ -5,7 +5,7 @@
<artifactId>haikudepotserver-parent</artifactId>
<groupId>org.haikuos</groupId>
<relativePath>../haikudepotserver-parent</relativePath>
- <version>1.0.7-SNAPSHOT</version>
+ <version>1.0.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
=======================================
--- /pom.xml Fri Sep 26 09:53:20 2014 UTC
+++ /pom.xml Fri Sep 26 11:07:26 2014 UTC
@@ -5,7 +5,7 @@
<groupId>org.haikuos</groupId>
<artifactId>haikudepotserver</artifactId>
<packaging>pom</packaging>
- <version>1.0.7-SNAPSHOT</version>
+ <version>1.0.7</version>
<modules>
<module>haikudepotserver-api1</module>
==============================================================================
Revision: e5550b83ef90
Author: Andrew Lindesay <apl@xxxxxxxxxxxxxx>
Date: Fri Sep 26 11:08:23 2014 UTC
Log: version 1.0.8-SNAPSHOT
https://code.google.com/p/haiku-depot-web-app/source/detail?r=e5550b83ef90
Modified:
/haikudepotserver-api1/pom.xml
/haikudepotserver-docs/pom.xml
/haikudepotserver-packagefile/pom.xml
/haikudepotserver-parent/pom.xml
/haikudepotserver-rpm-common/pom.xml
/haikudepotserver-rpm-parent/pom.xml
/haikudepotserver-rpm-production/pom.xml
/haikudepotserver-rpm-test/pom.xml
/haikudepotserver-webapp/pom.xml
/pom.xml
=======================================
--- /haikudepotserver-api1/pom.xml Fri Sep 26 11:07:26 2014 UTC
+++ /haikudepotserver-api1/pom.xml Fri Sep 26 11:08:23 2014 UTC
@@ -5,7 +5,7 @@
<artifactId>haikudepotserver-parent</artifactId>
<groupId>org.haikuos</groupId>
<relativePath>../haikudepotserver-parent</relativePath>
- <version>1.0.7</version>
+ <version>1.0.8-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
=======================================
--- /haikudepotserver-docs/pom.xml Fri Sep 26 11:07:26 2014 UTC
+++ /haikudepotserver-docs/pom.xml Fri Sep 26 11:08:23 2014 UTC
@@ -5,7 +5,7 @@
<artifactId>haikudepotserver-parent</artifactId>
<groupId>org.haikuos</groupId>
<relativePath>../haikudepotserver-parent</relativePath>
- <version>1.0.7</version>
+ <version>1.0.8-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
=======================================
--- /haikudepotserver-packagefile/pom.xml Fri Sep 26 11:07:26 2014 UTC
+++ /haikudepotserver-packagefile/pom.xml Fri Sep 26 11:08:23 2014 UTC
@@ -5,7 +5,7 @@
<artifactId>haikudepotserver-parent</artifactId>
<groupId>org.haikuos</groupId>
<relativePath>../haikudepotserver-parent</relativePath>
- <version>1.0.7</version>
+ <version>1.0.8-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
=======================================
--- /haikudepotserver-parent/pom.xml Fri Sep 26 11:07:26 2014 UTC
+++ /haikudepotserver-parent/pom.xml Fri Sep 26 11:08:23 2014 UTC
@@ -5,7 +5,7 @@
<groupId>org.haikuos</groupId>
<artifactId>haikudepotserver-parent</artifactId>
<packaging>pom</packaging>
- <version>1.0.7</version>
+ <version>1.0.8-SNAPSHOT</version>
<licenses>
<license>
=======================================
--- /haikudepotserver-rpm-common/pom.xml Fri Sep 26 11:07:26 2014 UTC
+++ /haikudepotserver-rpm-common/pom.xml Fri Sep 26 11:08:23 2014 UTC
@@ -5,7 +5,7 @@
<artifactId>haikudepotserver-parent</artifactId>
<groupId>org.haikuos</groupId>
<relativePath>../haikudepotserver-parent</relativePath>
- <version>1.0.7</version>
+ <version>1.0.8-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
=======================================
--- /haikudepotserver-rpm-parent/pom.xml Fri Sep 26 11:07:26 2014 UTC
+++ /haikudepotserver-rpm-parent/pom.xml Fri Sep 26 11:08:23 2014 UTC
@@ -5,7 +5,7 @@
<artifactId>haikudepotserver-parent</artifactId>
<groupId>org.haikuos</groupId>
<relativePath>../haikudepotserver-parent</relativePath>
- <version>1.0.7</version>
+ <version>1.0.8-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
=======================================
--- /haikudepotserver-rpm-production/pom.xml Fri Sep 26 11:07:26 2014 UTC
+++ /haikudepotserver-rpm-production/pom.xml Fri Sep 26 11:08:23 2014 UTC
@@ -5,7 +5,7 @@
<artifactId>haikudepotserver-rpm-parent</artifactId>
<groupId>org.haikuos</groupId>
<relativePath>../haikudepotserver-rpm-parent</relativePath>
- <version>1.0.7</version>
+ <version>1.0.8-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
=======================================
--- /haikudepotserver-rpm-test/pom.xml Fri Sep 26 11:07:26 2014 UTC
+++ /haikudepotserver-rpm-test/pom.xml Fri Sep 26 11:08:23 2014 UTC
@@ -5,7 +5,7 @@
<artifactId>haikudepotserver-rpm-parent</artifactId>
<groupId>org.haikuos</groupId>
<relativePath>../haikudepotserver-rpm-parent</relativePath>
- <version>1.0.7</version>
+ <version>1.0.8-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
=======================================
--- /haikudepotserver-webapp/pom.xml Fri Sep 26 11:07:26 2014 UTC
+++ /haikudepotserver-webapp/pom.xml Fri Sep 26 11:08:23 2014 UTC
@@ -5,7 +5,7 @@
<artifactId>haikudepotserver-parent</artifactId>
<groupId>org.haikuos</groupId>
<relativePath>../haikudepotserver-parent</relativePath>
- <version>1.0.7</version>
+ <version>1.0.8-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
=======================================
--- /pom.xml Fri Sep 26 11:07:26 2014 UTC
+++ /pom.xml Fri Sep 26 11:08:23 2014 UTC
@@ -5,7 +5,7 @@
<groupId>org.haikuos</groupId>
<artifactId>haikudepotserver</artifactId>
<packaging>pom</packaging>
- <version>1.0.7</version>
+ <version>1.0.8-SNAPSHOT</version>
<modules>
<module>haikudepotserver-api1</module>
Other related posts:
- » [haiku-depot-web] [haiku-depot-web-app] 7 new revisions pushed by haiku.li...@xxxxxxxxx on 2014-09-26 11:09 GMT - haiku-depot-web-app
