Skip to content
This repository was archived by the owner on Apr 15, 2021. It is now read-only.

Enhanced subscription service logging #928

Open
GoebelL wants to merge 8 commits into
base: v17.3.0-fix-branch
Choose a base branch
from
Open

Enhanced subscription service logging #928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ce3ecf1
Update local settings.
GoebelL Mar 6, 2019
2eb8278
Update classpath.
GoebelL Mar 6, 2019
2943b4c
Classpaths.
GoebelL Mar 6, 2019
49cc5e0
Enhanced logging.
GoebelL Mar 6, 2019
4560338
Test configs.
GoebelL Mar 6, 2019
63d9b0d
Fixed logging parameter.
GoebelL Mar 7, 2019
89d27c4
Add target for packaging only.
GoebelL Mar 7, 2019
76a7cc6
updated settings
GoebelL Mar 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
101 changes: 51 additions & 50 deletions example-service/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,50 +1,51 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="javasrc"/>
<classpathentry kind="src" path="javares"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="lib" path="/libraries/apache-codec/javalib/commons-codec-1.7.jar"/>
<classpathentry kind="lib" path="/libraries/apache-fileupload/javalib/commons-fileupload-1.2.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-httpclient/javalib/commons-httpclient-3.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-io/javalib/commons-io-1.4.jar"/>
<classpathentry kind="lib" path="/libraries/apache-logging/javalib/commons-logging-1.1.3.jar"/>
<classpathentry kind="lib" path="/libraries/backport/javalib/backport-util-concurrent-3.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/annogen-0.1.0.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axiom-api-1.2.8.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axiom-dom-1.2.8.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axiom-impl-1.2.8.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axis2-adb-1.5.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axis2-adb-codegen-1.5.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axis2-ant-plugin-1.5.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axis2-clustering-1.5.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axis2-codegen-1.5.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axis2-corba-1.5.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axis2-fastinfoset-1.5.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axis2-java2wsdl-1.5.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axis2-jaxbri-1.5.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axis2-jaxws-1.5.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axis2-jibx-1.5.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axis2-json-1.5.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axis2-kernel-1.5.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axis2-metadata-1.5.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axis2-mtompolicy-1.5.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axis2-saaj-1.5.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axis2-saaj-api-1.4.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axis2-spring-1.5.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axis2-transport-http-1.5.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axis2-transport-local-1.5.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axis2-xmlbeans-1.5.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/geronimo-stax-api_1.0_spec-1.0.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/httpcore-4.4.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/neethi-2.0.4.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/woden-api-1.0M8.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/woden-impl-dom-1.0M8.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/wsdl4j-1.6.2.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/wstx-asl-3.2.4.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/XmlSchema-1.4.3.jar"/>
<classpathentry kind="lib" path="/libraries/glassfish4/javalib/javaee.jar"/>
<classpathentry kind="lib" path="/libraries/glassfish4/modules/javax.servlet.jsp.jstl.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="javasrc"/>
<classpathentry kind="src" path="javares"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="lib" path="/libraries/apache-codec/javalib/commons-codec-1.7.jar"/>
<classpathentry kind="lib" path="/libraries/apache-fileupload/javalib/commons-fileupload-1.2.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-httpclient/javalib/commons-httpclient-3.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-io/javalib/commons-io-1.4.jar"/>
<classpathentry kind="lib" path="/libraries/apache-logging/javalib/commons-logging-1.1.3.jar"/>
<classpathentry kind="lib" path="/libraries/backport/javalib/backport-util-concurrent-3.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/annogen-0.1.0.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axiom-api-1.2.8.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axiom-dom-1.2.8.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axiom-impl-1.2.8.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axis2-adb-1.5.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axis2-adb-codegen-1.5.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axis2-ant-plugin-1.5.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axis2-clustering-1.5.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axis2-codegen-1.5.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axis2-corba-1.5.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axis2-fastinfoset-1.5.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axis2-java2wsdl-1.5.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axis2-jaxbri-1.5.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axis2-jaxws-1.5.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axis2-jibx-1.5.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axis2-json-1.5.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axis2-kernel-1.5.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axis2-metadata-1.5.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axis2-mtompolicy-1.5.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axis2-saaj-1.5.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axis2-saaj-api-1.4.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axis2-spring-1.5.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axis2-transport-http-1.5.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axis2-transport-local-1.5.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/axis2-xmlbeans-1.5.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/geronimo-stax-api_1.0_spec-1.0.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/httpcore-4.4.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/neethi-2.0.4.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/woden-api-1.0M8.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/woden-impl-dom-1.0M8.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/wsdl4j-1.6.2.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/wstx-asl-3.2.4.jar"/>
<classpathentry kind="lib" path="/libraries/apache-axis2-lib/javalib/XmlSchema-1.4.3.jar"/>
<classpathentry kind="lib" path="/libraries/glassfish4/javalib/javaee.jar"/>
<classpathentry kind="lib" path="/libraries/glassfish4/modules/javax.servlet.jsp.jstl.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/oscm-common"/>
<classpathentry kind="output" path="bin"/>
</classpath>
27 changes: 14 additions & 13 deletions j2ep-unittests/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="javasrc"/>
<classpathentry combineaccessrules="false" kind="src" path="/j2ep"/>
<classpathentry kind="lib" path="/libraries/junit/javalib/junit-4.5.jar"/>
<classpathentry kind="lib" path="/libraries/mockito/javalib/mockito-all-1.8.5.jar"/>
<classpathentry kind="lib" path="/libraries/apache-httpclient/javalib/commons-httpclient-3.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-logging/javalib/commons-logging-1.1.3.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/oscm-server-common"/>
<classpathentry kind="lib" path="/libraries/glassfish4/javalib/javaee.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="javasrc"/>
<classpathentry combineaccessrules="false" kind="src" path="/j2ep"/>
<classpathentry kind="lib" path="/libraries/junit/javalib/junit-4.5.jar"/>
<classpathentry kind="lib" path="/libraries/mockito/javalib/mockito-all-1.8.5.jar"/>
<classpathentry kind="lib" path="/libraries/apache-httpclient/javalib/commons-httpclient-3.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-logging/javalib/commons-logging-1.1.3.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/oscm-server-common"/>
<classpathentry kind="lib" path="/libraries/glassfish4/javalib/javaee.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/oscm-common"/>
<classpathentry kind="output" path="bin"/>
</classpath>
25 changes: 13 additions & 12 deletions mock-psp-service/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="javasrc"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="lib" path="/libraries/apache-httpclient/javalib/commons-httpclient-3.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-logging/javalib/commons-logging-1.1.3.jar"/>
<classpathentry kind="lib" path="/libraries/apache-codec/javalib/commons-codec-1.7.jar"/>
<classpathentry kind="lib" path="/libraries/glassfish4/javalib/javaee.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="javasrc"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="lib" path="/libraries/apache-httpclient/javalib/commons-httpclient-3.1.jar"/>
<classpathentry kind="lib" path="/libraries/apache-logging/javalib/commons-logging-1.1.3.jar"/>
<classpathentry kind="lib" path="/libraries/apache-codec/javalib/commons-codec-1.7.jar"/>
<classpathentry kind="lib" path="/libraries/glassfish4/javalib/javaee.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/oscm-common"/>
<classpathentry kind="output" path="bin"/>
</classpath>
10 changes: 2 additions & 8 deletions oscm-build/cruisecontrol.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@
<!-- Called by cruise control. All targets for cc start with runXYZ, all internal targets start with underscore -->
<target name="runJUnitTestsBuild" depends="_libraries, _clean, _package, _unittests, _copyResultArtifacts" />

<target name="runPackage" depends="_libraries, _clean, _package, _copyResultArtifacts" />

<target name="runCleanInstallBuild" depends="_libraries, _clean, _package, _setupGlassfishWithoutCoverage" />

<target name="runTravisUT" depends="_libraries">
Expand All @@ -57,14 +59,6 @@
<!-- Called by cruise control. All targets for cc start with runXYZ, all internal targets start with underscore -->
<target name="runIntegrationTests" depends="_libraries, _clean, _package, _integrationtests, _copyResultArtifacts" />

<!-- Called by cruise control. All targets for cc start with runXYZ, all internal targets start with underscore -->
<!--<target name="runDocBuild" depends="_clean, _docBuild"/>-->

<!--<target name="_docBuild">-->
<!--<echo message="***** Build user documentation *****"/>-->
<!--<ant antfile="build.xml" dir="../UserDoc/Tools" target="overall" />-->
<!--</target>-->

<target name="_copyGlassfishLogsAfterWebserviceTests">
<echo message="***** Copy glassfish logs after webservice test run *****" />
<ant antfile="build.xml" target="copyGlassfishLogs">
Expand Down
39 changes: 25 additions & 14 deletions oscm-common/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="javasrc"/>
<classpathentry kind="src" path="javares"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="lib" path="/libraries/apache-validator/javalib/commons-validator-1.4.0.jar"/>
<classpathentry kind="lib" path="/libraries/jakarta-oro/javalib/jakarta-oro-2.0.8.jar"/>
<classpathentry kind="lib" path="/libraries/apache-log4j/javalib/log4j-1.2.16.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/oscm-extsvc-internal"/>
<classpathentry kind="lib" path="/libraries/apache-codec/javalib/commons-codec-1.7.jar"/>
<classpathentry kind="lib" path="/libraries/glassfish4/javalib/javaee.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="javasrc"/>
<classpathentry kind="src" path="javares"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="lib" path="/libraries/apache-validator/javalib/commons-validator-1.4.0.jar"/>
<classpathentry kind="lib" path="/libraries/jakarta-oro/javalib/jakarta-oro-2.0.8.jar"/>
<classpathentry kind="lib" path="/libraries/apache-log4j/javalib/log4j-1.2.16.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/oscm-extsvc-internal"/>
<classpathentry kind="lib" path="/libraries/apache-codec/javalib/commons-codec-1.7.jar"/>
<classpathentry exported="true" kind="lib" path="/libraries/glassfish4/javalib/javaee.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry exported="true" kind="lib" path="/libraries/glassfish4/modules/javax.inject.jar"/>
<classpathentry exported="true" kind="lib" path="/libraries/glassfish4/modules/javax.servlet-api.jar"/>
<classpathentry exported="true" kind="lib" path="/libraries/glassfish4/modules/ejb.security.jar"/>
<classpathentry exported="true" kind="lib" path="/libraries/glassfish4/modules/javax.persistence.jar"/>
<classpathentry exported="true" kind="lib" path="/libraries/glassfish4/javalib/gf-client.jar"/>
<classpathentry exported="true" kind="lib" path="/libraries/glassfish4/javalib/javax.inject-1.jar"/>
<classpathentry exported="true" kind="lib" path="/libraries/glassfish4/modules/endorsed/javax.annotation-api.jar"/>
<classpathentry exported="true" kind="lib" path="/libraries/glassfish4/modules/javax.interceptor-api.jar"/>
<classpathentry exported="true" kind="lib" path="/libraries/glassfish4/modules/endorsed/webservices-api-osgi.jar"/>
<classpathentry exported="true" kind="lib" path="/libraries/glassfish4/modules/cdi-api.jar"/>
<classpathentry exported="true" kind="lib" path="/libraries/glassfish4/modules/javax.transaction-api.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
32 changes: 22 additions & 10 deletions oscm-common/javasrc/org/oscm/logging/Log4jLogger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,17 +76,17 @@ public class Log4jLogger {
*/
Log4jLogger(Class<?> category, Locale locale) {
this.locale = locale;
systemLogger = Logger.getLogger(SYSTEM_LOG_CATEGORY_SUFFIX + "."
+ category.getName());
systemLogger = Logger.getLogger(
SYSTEM_LOG_CATEGORY_SUFFIX + "." + category.getName());
systemLogger.setAdditivity(false);
accessLogger = Logger.getLogger(ACCESS_LOG_CATEGORY_SUFFIX + "."
+ category.getName());
accessLogger = Logger.getLogger(
ACCESS_LOG_CATEGORY_SUFFIX + "." + category.getName());
accessLogger.setAdditivity(false);
auditLogger = Logger.getLogger(AUDIT_LOG_CATEGORY_SUFFIX + "."
+ category.getName());
auditLogger = Logger.getLogger(
AUDIT_LOG_CATEGORY_SUFFIX + "." + category.getName());
auditLogger.setAdditivity(false);
proxyLogger = Logger.getLogger(REVERSEPROXY_LOG_CATEGORY_SUFFIX + "."
+ category.getName());
proxyLogger = Logger.getLogger(
REVERSEPROXY_LOG_CATEGORY_SUFFIX + "." + category.getName());
proxyLogger.setAdditivity(false);
}

Expand Down Expand Up @@ -118,6 +118,18 @@ public void logInfo(int logTargets, LogMessageIdentifier identifier,
}
}

/**
* Logs information with log type {@link Level#INFO}. The information is
* written to the system.log file.
*
* @param message
* The message to be logged.
*/
public void logInfoDebug(String message) {
String msgWithId = addMsgIdToMsg(LogMessageIdentifier.DEBUG, message);
systemLogger.info(msgWithId);
}

/**
* Logs an information with log type {@link Level#DEBUG}.
*
Expand Down Expand Up @@ -316,8 +328,8 @@ private String[] escapeParams(String... params) {
private ResourceBundle getResourceBundle() {
ResourceBundle bundleForLog;
try {
bundleForLog = ResourceBundle.getBundle(
LOG_MESSAGE_RESOURCE_BASENAME, locale);
bundleForLog = ResourceBundle
.getBundle(LOG_MESSAGE_RESOURCE_BASENAME, locale);
} catch (MissingResourceException e) {
bundleForLog = ResourceBundle
.getBundle(LOG_MESSAGE_RESOURCE_BASENAME);
Expand Down
3 changes: 3 additions & 0 deletions oscm-devruntime/javares/devscripts/build-dev-Database.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<import file="macrodefs-dev.xml"/>
<property environment="env" />
<property name="env.HOSTNAME" value="${env.COMPUTERNAME}" />

<property name="work.dir" location="${basedir}" />
<property name="dev.dir" location="${work.dir}/../../.." />
<property name="adm.ue.buildscript.dir" location="${dev.dir}/oscm-build" />
Expand Down Expand Up @@ -62,6 +63,8 @@
<env key="PGPASSWORD" value="@{dbadminpwd}" />
<arg value="-U" />
<arg value="@{dbadminuser}" />
<arg value="-h" />
<arg value="${db.host}" />
<arg value="--port" />
<arg value="${db.port}" />
<arg value="-f" />
Expand Down
6 changes: 6 additions & 0 deletions oscm-devruntime/javares/local/estgoebel1/SP_metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<!-- Copyright FUJITSU LIMITED 2017-->
<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="estgoebel1">
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://estgoebel1:8180/oscm-portal/" index="0"/>
</md:SPSSODescriptor>
</md:EntityDescriptor>
Loading