remove unnecessary things

sap-commerce-tools · Jan 20, 2021 · 1e3969e · 1e3969e
1 parent 8e8b4a6
commit 1e3969e
Show file tree

Hide file tree

Showing 12 changed files with 57 additions and 354 deletions.
diff --git a/buildcallbacks.xml b/buildcallbacks.xml
@@ -1,39 +1,38 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- [y] hybris Platform
-
- Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
-
- This software is the confidential and proprietary information of SAP
- ("Confidential Information"). You shall not disclose such Confidential
- Information and shall use it only in accordance with the terms of the
- license agreement you entered into with SAP.
---><project>
-
+<project>
 	<macrodef name="hacvcsinfo_after_build">
 		<sequential>
-			<!--you may want to change the dir="..." property -->
-			<exec executable="git" outputproperty="commit-hash" failifexecutionfails="false" failonerror="false" resultproperty="return.code"  >
+			<exec executable="git" dir="${ext.hacvcsinfo.path}" outputproperty="commit-hash" failifexecutionfails="false" failonerror="false" resultproperty="return.code"  >
 				<arg value="rev-parse"/>
 				<arg value="--short"/>
 				<arg value="HEAD"/>
 			</exec>
-			<exec executable="git" outputproperty="commit-tag" failifexecutionfails="false" failonerror="false" resultproperty="return.code" >
+			<exec executable="git" dir="${ext.hacvcsinfo.path}" outputproperty="commit-tag" failifexecutionfails="false" failonerror="false" resultproperty="return.code" >
 				<arg value="describe"/>
 				<arg value="--always"/>
 				<arg value="--tags"/>
 			</exec>
-			<exec executable="git" outputproperty="commit-branch" failifexecutionfails="false" failonerror="false" resultproperty="return.code" >
+			<exec executable="git" dir="${ext.hacvcsinfo.path}" outputproperty="commit-branch" failifexecutionfails="false" failonerror="false" resultproperty="return.code" >
 				<arg value="symbolic-ref"/>
 				<arg value="--short"/>
 				<arg value="HEAD"/>
 			</exec>
+			<exec executable="git" dir="${ext.hacvcsinfo.path}" outputproperty="commit-msg" failifexecutionfails="false" failonerror="false" resultproperty="return.code" >
+				<arg value="show"/>
+				<arg value="-s"/>
+				<arg value="--format=%s"/>
+				<arg value="HEAD"/>
+			</exec>
+			<echo message="hacvcsinfo hash: ${commit-hash}" />
+			<echo message="hacvcsinfo tag: ${commit-tag}" />
+			<echo message="hacvcsinfo branch: ${commit-branch}" />
+			<echo message="hacvcsinfo message: ${commit-msg}" />
 			<propertyfile file="${ext.hacvcsinfo.path}/resources/hacvcsinfo/vcs.properties">
 				<entry key="commit" value="${commit-hash}"/>
 				<entry key="tag" value="${commit-tag}"/>
 				<entry key="branch" value="${commit-branch}"/>
+				<entry key="message" value="${commit-msg}"/>
 			</propertyfile>
 		</sequential>
 	</macrodef>
-
 </project>
diff --git a/extensioninfo.xml b/extensioninfo.xml
@@ -1,20 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- [y] hybris Platform
-
- Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
-
- This software is the confidential and proprietary information of SAP
- ("Confidential Information"). You shall not disclose such Confidential
- Information and shall use it only in accordance with the terms of the
- license agreement you entered into with SAP.
---><extensioninfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="extensioninfo.xsd">
+<extensioninfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="extensioninfo.xsd">
    <extension abstractclassprefix="Generated" classprefix="Yhacext" managername="YhacextManager" managersuperclass="de.hybris.platform.jalo.extension.Extension" name="hacvcsinfo" usemaven="false">
-
-      <coremodule generated="true" manager="hacvcsinfo.jalo.YhacextManager" packageroot="hacvcsinfo"/>
-
+      <coremodule generated="true" manager="de.hybris.platform.jalo.extension.GenericManager" packageroot="hacvcsinfo"/>
       <meta key="hac-module" value="true"/>
-
    </extension>
-
 </extensioninfo>
diff --git a/external-dependencies.xml b/external-dependencies.xml
@@ -1,22 +1,10 @@
-<!--
- [y] hybris Platform
-
- Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
-
- This software is the confidential and proprietary information of SAP
- ("Confidential Information"). You shall not disclose such Confidential
- Information and shall use it only in accordance with the terms of the
- license agreement you entered into with SAP.
--->
 <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/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.hybris.platform</groupId>
 	<artifactId>hacvcsinfo</artifactId>
 	<version>18.08.0-RC16</version>
-
 	<packaging>jar</packaging>
-
 	<dependencies>
 	</dependencies>
 </project>
diff --git a/hac/resources/jsp/vcsinfo.jsp b/hac/resources/jsp/vcsinfo.jsp
@@ -3,34 +3,34 @@
 <% pageContext.setAttribute("newLineChar", "\n"); %>
 <html>
 <head>
-    <title>VCS Info</title>
-    <link rel="stylesheet" href="<c:url value="/static/css/table.css"/>" type="text/css" media="screen, projection"/>
-    <script type="text/javascript" src="<c:url value="/static/js/jquery.dataTables.min.js"/>"></script>
-    <script type="text/javascript" src="<c:url value="/static/js/history.js"/>"></script>
-    <script type="text/javascript" src="<c:url value="/static/js/vcsinfo.js"/>"></script>
+	<title>VCS Info</title>
+	<link rel="stylesheet" href="<c:url value="/static/css/table.css"/>" type="text/css" media="screen, projection"/>
+	<script type="text/javascript" src="<c:url value="/static/js/jquery.dataTables.min.js"/>"></script>
+	<script type="text/javascript" src="<c:url value="/static/js/history.js"/>"></script>
+	<script type="text/javascript" src="<c:url value="/static/js/vcsinfo.js"/>"></script>
 </head>
 <body>
 <div class="prepend-top span-17 colborder" id="content">
-    <button id="toggleSidebarButton">&gt;</button>
-    <div class="marginLeft marginBottom" id="inner">
-        <h2>VCS Info</h2>
-        <table id="vcsinfo">
-            <thead>
-            <tr>
-                <th width="25%">Property</th>
-                <th>Value</th>
-            </tr>
-            </thead>
-            <tbody>
-            <c:forEach items="${items}" var="item">
-                <tr>
-                    <td width="25%">${item.key}</td>
-                    <td>${item.value}</td>
-                </tr>
-            </c:forEach>
-            </tbody>
-        </table>
-    </div>
+	<button id="toggleSidebarButton">&gt;</button>
+	<div class="marginLeft marginBottom" id="inner">
+		<h2>VCS Info</h2>
+		<table id="vcsinfo">
+			<thead>
+			<tr>
+				<th width="25%">Property</th>
+				<th>Value</th>
+			</tr>
+			</thead>
+			<tbody>
+			<c:forEach items="${items}" var="item">
+				<tr>
+					<td width="25%">${item.key}</td>
+					<td>${item.value}</td>
+				</tr>
+			</c:forEach>
+			</tbody>
+		</table>
+	</div>
 </div>
 <div id="dialogContainer"></div>
 </body>

diff --git a/hac/src/de/hybris/platform/hac/controller/HacVCSInfoController.java b/hac/src/de/hybris/platform/hac/controller/HacVCSInfoController.java
@@ -1,13 +1,3 @@
-/*
- * [y] hybris Platform
- *
- * Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
- *
- * This software is the confidential and proprietary information of SAP
- * ("Confidential Information"). You shall not disclose such Confidential
- * Information and shall use it only in accordance with the terms of the
- * license agreement you entered into with SAP.
- */
 package de.hybris.platform.hac.controller;
 
 import org.springframework.stereotype.Controller;
@@ -20,10 +10,6 @@
 import java.util.Map;
 import java.util.Properties;
 
-
-/**
- *
- */
 @Controller
 @RequestMapping("/hacvcsinfo/**")
 public class HacVCSInfoController

diff --git a/project.properties b/project.properties
@@ -1,19 +1,2 @@
-# -----------------------------------------------------------------------
-# [y] hybris Platform
-#
-# Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
-#
-# This software is the confidential and proprietary information of SAP
-# ("Confidential Information"). You shall not disclose such Confidential
-# Information and shall use it only in accordance with the terms of the
-# license agreement you entered into with SAP.
-# -----------------------------------------------------------------------
-
-hacvcsinfo.key=value
-
 # Specifies the location of the spring context file putted automatically to the global platform application context.
 hacvcsinfo.application-context=hacvcsinfo-spring.xml
-
-# https://jira.hybris.com/browse/ECP-2832
-hac.tomcat.tld.scan=displaytag*.jar,jstl*.jar,jstl-impl*.jar,*_hac.jar
-hac.tomcat.pluggability.scan=displaytag*.jar,jstl*.jar,jstl-impl*.jar,*_hac.jar
diff --git a/resources/hacvcsinfo-beans.xml b/resources/hacvcsinfo-beans.xml
@@ -1,18 +1,3 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- [y] hybris Platform
-
- Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
-
- This software is the confidential and proprietary information of SAP
- ("Confidential Information"). You shall not disclose such Confidential
- Information and shall use it only in accordance with the terms of the
- license agreement you entered into with SAP.
--->
-<!--
-	ATTENTION: This is just an example file. You have to edit it according to your needs.
--->
-
 <beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="beans.xsd">
-
 </beans>
diff --git a/resources/hacvcsinfo-items.xml b/resources/hacvcsinfo-items.xml
@@ -1,22 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- [y] hybris Platform
-
- Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
-
- This software is the confidential and proprietary information of SAP
- ("Confidential Information"). You shall not disclose such Confidential
- Information and shall use it only in accordance with the terms of the
- license agreement you entered into with SAP.
--->
-<!--
-	ATTENTION: This is just an example file. You have to edit it according to your needs.
--->
-
 <items 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-			xsi:noNamespaceSchemaLocation="items.xsd">
-
+		xsi:noNamespaceSchemaLocation="items.xsd">
 	<itemtypes>
-
 	</itemtypes>
 </items>
diff --git a/resources/hacvcsinfo-spring.xml b/resources/hacvcsinfo-spring.xml
@@ -1,27 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
- [y] hybris Platform
-
- Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
-
- This software is the confidential and proprietary information of SAP
- ("Confidential Information"). You shall not disclose such Confidential
- Information and shall use it only in accordance with the terms of the
- license agreement you entered into with SAP.
--->
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:aop="http://www.springframework.org/schema/aop"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-           http://www.springframework.org/schema/beans/spring-beans.xsd
-           http://www.springframework.org/schema/aop
-           http://www.springframework.org/schema/aop/spring-aop.xsd">
+			http://www.springframework.org/schema/beans/spring-beans.xsd
+			http://www.springframework.org/schema/aop
+			http://www.springframework.org/schema/aop/spring-aop.xsd">
 
 	<bean id="hacvcsinfoHacTabsConfig" class="de.hybris.platform.hac.custom.JsonHacConfiguration">
 		<property name="resource" value="classpath:hacvcsinfo-tab-config.json"/>
 	</bean>
-
-
 	<bean id="vcsProperties"
 		  class="org.springframework.beans.factory.config.PropertiesFactoryBean">
 		<property name="locations">

diff --git a/src/hacvcsinfo/YhacextStandalone.java b/src/hacvcsinfo/YhacextStandalone.java
diff --git a/src/hacvcsinfo/constants/YhacextConstants.java b/src/hacvcsinfo/constants/YhacextConstants.java
@@ -1,26 +1,11 @@
-/*
- * [y] hybris Platform
- *
- * Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
- *
- * This software is the confidential and proprietary information of SAP
- * ("Confidential Information"). You shall not disclose such Confidential
- * Information and shall use it only in accordance with the terms of the
- * license agreement you entered into with SAP.
- */
-package hacvcsinfo.constants;
-
-/**
- * Global class for all Yhacext constants. You can add global constants for your extension into this class.
- */
-public final class YhacextConstants extends GeneratedYhacextConstants
-{
-	public static final String EXTENSIONNAME = "hacvcsinfo";
-
-	private YhacextConstants()
-	{
-		//empty to avoid instantiating this constant class
-	}
-
-	// implement here constants used by this extension
-}
+package hacvcsinfo.constants;
+
+@SuppressWarnings({"deprecation","squid:CallToDeprecatedMethod"})
+public class YhacextConstants extends GeneratedYhacextConstants
+{
+	public static final String EXTENSIONNAME = "hacvcsinfo";
+	private YhacextConstants()
+	{
+		//empty
+	}
+}