Skip to content

Commit 1e3969e

Browse files
mpernmpern
committed
remove unnecessary things
1 parent 8e8b4a6 commit 1e3969e

File tree

12 files changed

+57
-354
lines changed

12 files changed

+57
-354
lines changed

‎buildcallbacks.xml‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,38 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<!--
3-
[y] hybris Platform
4-
5-
Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
6-
7-
This software is the confidential and proprietary information of SAP
8-
("Confidential Information"). You shall not disclose such Confidential
9-
Information and shall use it only in accordance with the terms of the
10-
license agreement you entered into with SAP.
11-
--><project>
12-
2+
<project>
133
<macrodef name="hacvcsinfo_after_build">
144
<sequential>
15-
<!--you may want to change the dir="..." property -->
16-
<exec executable="git" outputproperty="commit-hash" failifexecutionfails="false" failonerror="false" resultproperty="return.code" >
5+
<exec executable="git" dir="${ext.hacvcsinfo.path}" outputproperty="commit-hash" failifexecutionfails="false" failonerror="false" resultproperty="return.code" >
176
<arg value="rev-parse"/>
187
<arg value="--short"/>
198
<arg value="HEAD"/>
209
</exec>
21-
<exec executable="git" outputproperty="commit-tag" failifexecutionfails="false" failonerror="false" resultproperty="return.code" >
10+
<exec executable="git" dir="${ext.hacvcsinfo.path}" outputproperty="commit-tag" failifexecutionfails="false" failonerror="false" resultproperty="return.code" >
2211
<arg value="describe"/>
2312
<arg value="--always"/>
2413
<arg value="--tags"/>
2514
</exec>
26-
<exec executable="git" outputproperty="commit-branch" failifexecutionfails="false" failonerror="false" resultproperty="return.code" >
15+
<exec executable="git" dir="${ext.hacvcsinfo.path}" outputproperty="commit-branch" failifexecutionfails="false" failonerror="false" resultproperty="return.code" >
2716
<arg value="symbolic-ref"/>
2817
<arg value="--short"/>
2918
<arg value="HEAD"/>
3019
</exec>
20+
<exec executable="git" dir="${ext.hacvcsinfo.path}" outputproperty="commit-msg" failifexecutionfails="false" failonerror="false" resultproperty="return.code" >
21+
<arg value="show"/>
22+
<arg value="-s"/>
23+
<arg value="--format=%s"/>
24+
<arg value="HEAD"/>
25+
</exec>
26+
<echo message="hacvcsinfo hash: ${commit-hash}" />
27+
<echo message="hacvcsinfo tag: ${commit-tag}" />
28+
<echo message="hacvcsinfo branch: ${commit-branch}" />
29+
<echo message="hacvcsinfo message: ${commit-msg}" />
3130
<propertyfile file="${ext.hacvcsinfo.path}/resources/hacvcsinfo/vcs.properties">
3231
<entry key="commit" value="${commit-hash}"/>
3332
<entry key="tag" value="${commit-tag}"/>
3433
<entry key="branch" value="${commit-branch}"/>
34+
<entry key="message" value="${commit-msg}"/>
3535
</propertyfile>
3636
</sequential>
3737
</macrodef>
38-
3938
</project>

‎extensioninfo.xml‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<!--
3-
[y] hybris Platform
4-
5-
Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
6-
7-
This software is the confidential and proprietary information of SAP
8-
("Confidential Information"). You shall not disclose such Confidential
9-
Information and shall use it only in accordance with the terms of the
10-
license agreement you entered into with SAP.
11-
--><extensioninfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="extensioninfo.xsd">
2+
<extensioninfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="extensioninfo.xsd">
123
<extension abstractclassprefix="Generated" classprefix="Yhacext" managername="YhacextManager" managersuperclass="de.hybris.platform.jalo.extension.Extension" name="hacvcsinfo" usemaven="false">
13-
14-
<coremodule generated="true" manager="hacvcsinfo.jalo.YhacextManager" packageroot="hacvcsinfo"/>
15-
4+
<coremodule generated="true" manager="de.hybris.platform.jalo.extension.GenericManager" packageroot="hacvcsinfo"/>
165
<meta key="hac-module" value="true"/>
17-
186
</extension>
19-
207
</extensioninfo>

‎external-dependencies.xml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,10 @@
1-
<!--
2-
[y] hybris Platform
3-
4-
Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
5-
6-
This software is the confidential and proprietary information of SAP
7-
("Confidential Information"). You shall not disclose such Confidential
8-
Information and shall use it only in accordance with the terms of the
9-
license agreement you entered into with SAP.
10-
-->
111
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
122
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
133
<modelVersion>4.0.0</modelVersion>
144
<groupId>de.hybris.platform</groupId>
155
<artifactId>hacvcsinfo</artifactId>
166
<version>18.08.0-RC16</version>
17-
187
<packaging>jar</packaging>
19-
208
<dependencies>
219
</dependencies>
2210
</project>

‎hac/resources/jsp/vcsinfo.jsp‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,34 @@
33
<% pageContext.setAttribute("newLineChar", "\n"); %>
44
<html>
55
<head>
6-
<title>VCS Info</title>
7-
<link rel="stylesheet" href="<c:url value="/static/css/table.css"/>" type="text/css" media="screen, projection"/>
8-
<script type="text/javascript" src="<c:url value="/static/js/jquery.dataTables.min.js"/>"></script>
9-
<script type="text/javascript" src="<c:url value="/static/js/history.js"/>"></script>
10-
<script type="text/javascript" src="<c:url value="/static/js/vcsinfo.js"/>"></script>
6+
<title>VCS Info</title>
7+
<link rel="stylesheet" href="<c:url value="/static/css/table.css"/>" type="text/css" media="screen, projection"/>
8+
<script type="text/javascript" src="<c:url value="/static/js/jquery.dataTables.min.js"/>"></script>
9+
<script type="text/javascript" src="<c:url value="/static/js/history.js"/>"></script>
10+
<script type="text/javascript" src="<c:url value="/static/js/vcsinfo.js"/>"></script>
1111
</head>
1212
<body>
1313
<div class="prepend-top span-17 colborder" id="content">
14-
<button id="toggleSidebarButton">&gt;</button>
15-
<div class="marginLeft marginBottom" id="inner">
16-
<h2>VCS Info</h2>
17-
<table id="vcsinfo">
18-
<thead>
19-
<tr>
20-
<th width="25%">Property</th>
21-
<th>Value</th>
22-
</tr>
23-
</thead>
24-
<tbody>
25-
<c:forEach items="${items}" var="item">
26-
<tr>
27-
<td width="25%">${item.key}</td>
28-
<td>${item.value}</td>
29-
</tr>
30-
</c:forEach>
31-
</tbody>
32-
</table>
33-
</div>
14+
<button id="toggleSidebarButton">&gt;</button>
15+
<div class="marginLeft marginBottom" id="inner">
16+
<h2>VCS Info</h2>
17+
<table id="vcsinfo">
18+
<thead>
19+
<tr>
20+
<th width="25%">Property</th>
21+
<th>Value</th>
22+
</tr>
23+
</thead>
24+
<tbody>
25+
<c:forEach items="${items}" var="item">
26+
<tr>
27+
<td width="25%">${item.key}</td>
28+
<td>${item.value}</td>
29+
</tr>
30+
</c:forEach>
31+
</tbody>
32+
</table>
33+
</div>
3434
</div>
3535
<div id="dialogContainer"></div>
3636
</body>

‎hac/src/de/hybris/platform/hac/controller/HacVCSInfoController.java‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
/*
2-
* [y] hybris Platform
3-
*
4-
* Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
5-
*
6-
* This software is the confidential and proprietary information of SAP
7-
* ("Confidential Information"). You shall not disclose such Confidential
8-
* Information and shall use it only in accordance with the terms of the
9-
* license agreement you entered into with SAP.
10-
*/
111
package de.hybris.platform.hac.controller;
122

133
import org.springframework.stereotype.Controller;
@@ -20,10 +10,6 @@
2010
import java.util.Map;
2111
import java.util.Properties;
2212

23-
24-
/**
25-
*
26-
*/
2713
@Controller
2814
@RequestMapping("/hacvcsinfo/**")
2915
public class HacVCSInfoController

‎project.properties‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,2 @@
1-
# -----------------------------------------------------------------------
2-
# [y] hybris Platform
3-
#
4-
# Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
5-
#
6-
# This software is the confidential and proprietary information of SAP
7-
# ("Confidential Information"). You shall not disclose such Confidential
8-
# Information and shall use it only in accordance with the terms of the
9-
# license agreement you entered into with SAP.
10-
# -----------------------------------------------------------------------
11-
12-
hacvcsinfo.key=value
13-
141
# Specifies the location of the spring context file putted automatically to the global platform application context.
152
hacvcsinfo.application-context=hacvcsinfo-spring.xml
16-
17-
# https://jira.hybris.com/browse/ECP-2832
18-
hac.tomcat.tld.scan=displaytag*.jar,jstl*.jar,jstl-impl*.jar,*_hac.jar
19-
hac.tomcat.pluggability.scan=displaytag*.jar,jstl*.jar,jstl-impl*.jar,*_hac.jar

‎resources/hacvcsinfo-beans.xml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,3 @@
11
<?xml version="1.0" encoding="ISO-8859-1"?>
2-
<!--
3-
[y] hybris Platform
4-
5-
Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
6-
7-
This software is the confidential and proprietary information of SAP
8-
("Confidential Information"). You shall not disclose such Confidential
9-
Information and shall use it only in accordance with the terms of the
10-
license agreement you entered into with SAP.
11-
-->
12-
<!--
13-
ATTENTION: This is just an example file. You have to edit it according to your needs.
14-
-->
15-
162
<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="beans.xsd">
17-
183
</beans>

‎resources/hacvcsinfo-items.xml‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,6 @@
11
<?xml version="1.0" encoding="ISO-8859-1"?>
2-
<!--
3-
[y] hybris Platform
4-
5-
Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
6-
7-
This software is the confidential and proprietary information of SAP
8-
("Confidential Information"). You shall not disclose such Confidential
9-
Information and shall use it only in accordance with the terms of the
10-
license agreement you entered into with SAP.
11-
-->
12-
<!--
13-
ATTENTION: This is just an example file. You have to edit it according to your needs.
14-
-->
15-
162
<items xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
17-
xsi:noNamespaceSchemaLocation="items.xsd">
18-
3+
xsi:noNamespaceSchemaLocation="items.xsd">
194
<itemtypes>
20-
215
</itemtypes>
226
</items>

‎resources/hacvcsinfo-spring.xml‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--
3-
[y] hybris Platform
4-
5-
Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
6-
7-
This software is the confidential and proprietary information of SAP
8-
("Confidential Information"). You shall not disclose such Confidential
9-
Information and shall use it only in accordance with the terms of the
10-
license agreement you entered into with SAP.
11-
-->
122
<beans xmlns="http://www.springframework.org/schema/beans"
133
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
144
xmlns:aop="http://www.springframework.org/schema/aop"
155
xsi:schemaLocation="http://www.springframework.org/schema/beans
16-
http://www.springframework.org/schema/beans/spring-beans.xsd
17-
http://www.springframework.org/schema/aop
18-
http://www.springframework.org/schema/aop/spring-aop.xsd">
6+
http://www.springframework.org/schema/beans/spring-beans.xsd
7+
http://www.springframework.org/schema/aop
8+
http://www.springframework.org/schema/aop/spring-aop.xsd">
199

2010
<bean id="hacvcsinfoHacTabsConfig" class="de.hybris.platform.hac.custom.JsonHacConfiguration">
2111
<property name="resource" value="classpath:hacvcsinfo-tab-config.json"/>
2212
</bean>
23-
24-
2513
<bean id="vcsProperties"
2614
class="org.springframework.beans.factory.config.PropertiesFactoryBean">
2715
<property name="locations">

‎src/hacvcsinfo/YhacextStandalone.java‎

Lines changed: 0 additions & 53 deletions
This file was deleted.

0 commit comments

Comments
 (0)