diff --git a/ccm-gen-aplaws/bundles/devel/cfg/project.xml b/ccm-gen-aplaws/bundles/devel/cfg/project.xml index eb26be3d7..4400e4597 100644 --- a/ccm-gen-aplaws/bundles/devel/cfg/project.xml +++ b/ccm-gen-aplaws/bundles/devel/cfg/project.xml @@ -8,8 +8,8 @@ ccmVersion="6.1" name="aplaws-gen" prettyName="APLAWS plus" - version="1-1-2" - release="alpha-1" + version="1-1-4" + release="1107" webxml="web.xml-aplaws" webapp="ROOT" xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd"> diff --git a/ccm-gen-aplaws/bundles/develpb/cfg/project.xml b/ccm-gen-aplaws/bundles/develpb/cfg/project.xml index dae59f9c6..67845a274 100644 --- a/ccm-gen-aplaws/bundles/develpb/cfg/project.xml +++ b/ccm-gen-aplaws/bundles/develpb/cfg/project.xml @@ -8,8 +8,8 @@ ccmVersion="6.1" name="aplaws-gen" prettyName="APLAWS plus" - version="1-1-2" - release="trunk" + version="1-1-4" + release="r1107" webxml="web.xml-aplaws" webapp="ROOT" xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd"> diff --git a/ccm-gen-aplaws/bundles/handbook/cfg/project.xml b/ccm-gen-aplaws/bundles/handbook/cfg/project.xml index 0e914bd09..2cf795d21 100644 --- a/ccm-gen-aplaws/bundles/handbook/cfg/project.xml +++ b/ccm-gen-aplaws/bundles/handbook/cfg/project.xml @@ -7,8 +7,8 @@ ccmVersion="6.1" name="aplaws-handbook" prettyName="APLAWS plus" - version="1-1-0" - release="423" + version="1-1-4" + release="r1110" webxml="web.xml-aplaws" webapp="ROOT" xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd"> @@ -30,54 +30,26 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -99,6 +71,35 @@ contain java code to be compiled! --> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ccm-gen-aplaws/bundles/nsh/cfg/project.xml b/ccm-gen-aplaws/bundles/nsh/cfg/project.xml index e3964fc8b..93125de71 100644 --- a/ccm-gen-aplaws/bundles/nsh/cfg/project.xml +++ b/ccm-gen-aplaws/bundles/nsh/cfg/project.xml @@ -8,8 +8,8 @@ ccmVersion="6.1" name="aplaws-nsh" prettyName="APLAWS plus NSH" - version="1-1-1" - release="r796" + version="1-1-4" + release="r1110" webxml="web.xml-aplaws" webapp="ROOT" xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd"> diff --git a/ccm-gen-aplaws/bundles/staatsschiff/cfg/project.xml b/ccm-gen-aplaws/bundles/staatsschiff/cfg/project.xml index 9cefe9df0..bcf1c4ea5 100644 --- a/ccm-gen-aplaws/bundles/staatsschiff/cfg/project.xml +++ b/ccm-gen-aplaws/bundles/staatsschiff/cfg/project.xml @@ -7,8 +7,8 @@ ccmVersion="6.1" name="aplaws-staatsschiff" prettyName="APLAWS plus" - version="1-1-1" - release="780" + version="1-1-4" + release="1110" webxml="web.xml-aplaws" webapp="ROOT" xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd"> diff --git a/ccm-gen-aplaws/bundles/zsr/cfg/project.xml b/ccm-gen-aplaws/bundles/zsr/cfg/project.xml index 2ad0f352b..978b0bac3 100644 --- a/ccm-gen-aplaws/bundles/zsr/cfg/project.xml +++ b/ccm-gen-aplaws/bundles/zsr/cfg/project.xml @@ -7,8 +7,8 @@ ccmVersion="6.1" name="aplaws-zsr" prettyName="APLAWS plus" - version="1-1-1" - release="765" + version="1-1-4" + release="1110" webxml="web.xml-aplaws" webapp="ROOT" xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd"> diff --git a/ccm-iaw-aplaws/bundles/devel/cfg/project.xml b/ccm-iaw-aplaws/bundles/devel/cfg/project.xml index 38a4d140a..91f7927b7 100644 --- a/ccm-iaw-aplaws/bundles/devel/cfg/project.xml +++ b/ccm-iaw-aplaws/bundles/devel/cfg/project.xml @@ -7,8 +7,8 @@ ccmVersion="6.1" name="aplaws-iaw" prettyName="APLAWS plus" - version="1-1-1" - release="rc2-780" + version="1-1-4" + release="r1107" webxml="web.xml-aplaws" webapp="ROOT" xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd"> diff --git a/ccm-iaw-aplaws/bundles/standard/cfg/integration.properties b/ccm-iaw-aplaws/bundles/standard/cfg/integration.properties index bf5fc151d..ff947f044 100644 --- a/ccm-iaw-aplaws/bundles/standard/cfg/integration.properties +++ b/ccm-iaw-aplaws/bundles/standard/cfg/integration.properties @@ -138,7 +138,7 @@ waf.admin.password.question=12345 waf.admin.password.answer=6 ; devel specific configurations -waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/iaw-113?user\=iaw&password\=iaw24 +waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/iaw-114?user\=iaw&password\=iaw24 waf.runtime.jdbc_pool_size=40 waf.web.server=localhost\:8080 diff --git a/ccm-iaw-aplaws/bundles/standard/cfg/project.xml b/ccm-iaw-aplaws/bundles/standard/cfg/project.xml index 38a4d140a..47e089345 100644 --- a/ccm-iaw-aplaws/bundles/standard/cfg/project.xml +++ b/ccm-iaw-aplaws/bundles/standard/cfg/project.xml @@ -7,8 +7,8 @@ ccmVersion="6.1" name="aplaws-iaw" prettyName="APLAWS plus" - version="1-1-1" - release="rc2-780" + version="1-1-4" + release="r1110" webxml="web.xml-aplaws" webapp="ROOT" xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd"> @@ -29,17 +29,59 @@ - - + - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -47,13 +89,10 @@ - - - @@ -65,7 +104,6 @@ - @@ -77,31 +115,6 @@ - - - - - - - - - - - - - - - - - - - -