Skip to content
This repository was archived by the owner on Jul 9, 2022. It is now read-only.

Commit 3d30328

Browse files
ghillertghillert
committed
INTTEMPLATES-1 Template not using artifactId
The standalone (File) Template does not use the artifactId that you provide in the wizard For reference see: https://jira.springsource.org/browse/INTTEMPLATES-1 Also updated: * license header (year) * version: changed M2 to M3
1 parent e7e4007 commit 3d30328

File tree

27 files changed

+36
-41
lines changed

27 files changed

+36
-41
lines changed

‎.project

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<projectDescription>
3-
<name>hillert-war</name>
3+
<name>spring-integration-templates-root</name>
44
<comment></comment>
55
<projects>
66
</projects>

‎README.md

+1-5
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,4 @@ This repository contains templates and plugins that will help you to get Spring
66
* Spring Integration STS Plugin and Templates (**si-sts-templates**)
77
* Spring Integration Gradle Plugin (**si-gradle-plugin**)
88

9-
Both the STS support and the Gradle Plugin provide the same set of templates that are located under **si-template-projects**
10-
11-
If you encounter issues or have specific feature requests, please open a Jira support ticket at:
12-
13-
* https://jira.springsource.org/browse/INTTEMPLATES
9+
Both the STS support and the Gradle Plugin use the same set of template projects, which are located under **si-template-projects**

‎si-sts-templates/README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Spring Integration STS Plugin and Templates
22
===========================================
33

4-
This project provides an plugin and various projects for SpringSource Tool Suite™.
4+
This project provides an plugin and various projects for SpringSource Tool Suite™.
55

66
# How to build the project
77

@@ -12,17 +12,17 @@ In order to build the entire project run:
1212
This will result in *3 artifacts* being created under **target/out**:
1313

1414
* descriptor.xml
15-
* org.springframework.integration.sts.templates_1.0.0.M2.jar
16-
* si-template-1.0.0.M2.zip
15+
* org.springframework.integration.sts.templates_1.0.0.M3.jar
16+
* si-template-1.0.0.M3.zip
1717

1818
In order to deploy to STS you have 2 options:
1919

20-
1. drop the Eclipse plugin **org.springframework.integration.sts.templates_1.0.0.M2.jar**
20+
1. drop the Eclipse plugin **org.springframework.integration.sts.templates_1.0.0.M3.jar**
2121
to your Eclipse STS **dropins/plugins folder**. Restart Eclipse STS.
2222

2323
2. Option 2 is good for developing/changing the Eclipse STS template.
2424

25-
Take the **si-template-1.0.0.M2.zip** jar file and unpack it in your Eclipse workspace in a directory called
25+
Take the **si-template-1.0.0.M3.zip** jar file and unpack it in your Eclipse workspace in a directory called
2626
**.metadata/.sts/content/${pom.artifactId}-${pom.version}**. Then add or edit the
2727
template descriptor in **.metadata/.plugins/com.springsource.sts.content.core/content.xml**
2828
so it has this form:

‎si-sts-templates/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>org.springframework.integration.sts.templates</groupId>
55
<artifactId>si-template-parent</artifactId>
6-
<version>1.0.0.M2</version>
6+
<version>1.0.0.M3</version>
77
<packaging>pom</packaging>
88

99
<modules>

‎si-sts-templates/si-template-plugin/META-INF/MANIFEST.MF

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: Spring Integration STS Plugin
44
Bundle-SymbolicName: org.springframework.integration.sts.templates;singleton:=true
5-
Bundle-Version: 1.0.0.M2
5+
Bundle-Version: 1.0.0.M3

‎si-sts-templates/si-template-plugin/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.integration.sts.templates</groupId>
77
<artifactId>si-template-parent</artifactId>
8-
<version>1.0.0.M2</version>
8+
<version>1.0.0.M3</version>
99
</parent>
1010
<artifactId>si-template-plugin</artifactId>
1111
<packaging>pom</packaging>

‎si-sts-templates/si-template-standalone-simple/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
<groupId>org.springframework.integration.sts.templates</groupId>
66
<artifactId>si-template-standalone-simple</artifactId>
7-
<version>1.0.0.M2</version>
7+
<version>1.0.0.M3</version>
88
<packaging>pom</packaging>
99

1010
<parent>
1111
<groupId>org.springframework.integration.sts.templates</groupId>
1212
<artifactId>si-template-parent</artifactId>
13-
<version>1.0.0.M2</version>
13+
<version>1.0.0.M3</version>
1414
</parent>
1515

1616
<properties>

‎si-sts-templates/si-template-standalone-simple/template/wizard.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
"topLevelPackage" : "stsorg.stsspringframework.stsintegration.mysubsystem",
4141

42-
"projectName" : "si-template-project-standalone-simple",
42+
"projectName" : "si-template-project-name",
4343

4444
"pages" : {
4545
"page" : [

‎si-sts-templates/si-template-standalone/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
<groupId>org.springframework.integration.sts.templates</groupId>
66
<artifactId>si-template-standalone</artifactId>
7-
<version>1.0.0.M2</version>
7+
<version>1.0.0.M3</version>
88
<packaging>pom</packaging>
99

1010
<parent>
1111
<groupId>org.springframework.integration.sts.templates</groupId>
1212
<artifactId>si-template-parent</artifactId>
13-
<version>1.0.0.M2</version>
13+
<version>1.0.0.M3</version>
1414
</parent>
1515

1616
<properties>

‎si-sts-templates/si-template-standalone/template/wizard.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"required" : true,
1111
},
1212
{
13-
"name" : "mavenArtifactId",
13+
"name" : "si-template-standalone-artifactId",
1414
"description" : "Please enter an 'artifactId'",
1515
"type" : "java.lang.String",
1616
"page" : 0,
@@ -39,7 +39,7 @@
3939

4040
"topLevelPackage" : "stsorg.stsspringframework.stsintegration.mysubsystem",
4141

42-
"projectName" : "si-template-project-java",
42+
"projectName" : "si-template-project-name",
4343

4444
"pages" : {
4545
"page" : [

‎si-sts-templates/si-template-war/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
<parent>
77
<groupId>org.springframework.integration.sts.templates</groupId>
88
<artifactId>si-template-parent</artifactId>
9-
<version>1.0.0.M2</version>
9+
<version>1.0.0.M3</version>
1010
</parent>
1111

1212
<groupId>org.springframework.integration.sts.templates</groupId>
1313
<artifactId>si-template-war</artifactId>
14-
<version>1.0.0.M2</version>
14+
<version>1.0.0.M3</version>
1515
<packaging>pom</packaging>
1616

1717
<properties>

‎si-template-projects/si-template-standalone-project/.project

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<projectDescription>
3-
<name>si-template-standalone</name>
3+
<name>si-template-project-name</name>
44
<comment></comment>
55
<projects>
66
</projects>

‎si-template-projects/si-template-standalone-project/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<version>mavenVersion</version>
88
<packaging>jar</packaging>
99

10-
<name>si-template-project-standalone</name>
10+
<name>si-template-project-name</name>
1111
<url>http://www.springsource.org/spring-integration</url>
1212

1313
<prerequisites>

‎si-template-projects/si-template-standalone-project/src/main/java/stsorg/stsspringframework/stsintegration/Main.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2010 the original author or authors.
2+
* Copyright 2002-2012 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎si-template-projects/si-template-standalone-project/src/main/java/stsorg/stsspringframework/stsintegration/SpringIntegrationUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2010 the original author or authors.
2+
* Copyright 2002-2012 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎si-template-projects/si-template-standalone-project/src/main/java/stsorg/stsspringframework/stsintegration/TransformationHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2010 the original author or authors.
2+
* Copyright 2002-2012 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎si-template-projects/si-template-standalone-project/src/test/java/stsorg/stsspringframework/stsintegration/SpringIntegrationProjectStartupTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2010 the original author or authors.
2+
* Copyright 2002-2012 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎si-template-projects/si-template-standalone-simple-project/.project

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<projectDescription>
3-
<name>si-template-standalone-simple</name>
3+
<name>si-template-project-name</name>
44
<comment></comment>
55
<projects>
66
</projects>

‎si-template-projects/si-template-standalone-simple-project/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<version>mavenVersion</version>
88
<packaging>jar</packaging>
99

10-
<name>si-template-project-standalone-simple</name>
10+
<name>si-template-project-name</name>
1111
<url>http://www.springsource.org/spring-integration</url>
1212

1313
<prerequisites>

‎si-template-projects/si-template-standalone-simple-project/src/main/java/stsorg/stsspringframework/stsintegration/Main.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2010 the original author or authors.
2+
* Copyright 2002-2012 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎si-template-projects/si-template-standalone-simple-project/src/main/java/stsorg/stsspringframework/stsintegration/service/StringConversionService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2010 the original author or authors
2+
* Copyright 2002-2012 the original author or authors
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎si-template-projects/si-template-standalone-simple-project/src/test/java/stsorg/stsspringframework/stsintegration/StringConversionServiceTest.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2010 the original author or authors.
2+
* Copyright 2002-2012 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -31,8 +31,7 @@ public class StringConversionServiceTest {
3131

3232
@Test
3333
public void testStartupOfSpringInegrationContext() throws Exception{
34-
final ApplicationContext context
35-
= new ClassPathXmlApplicationContext("/META-INF/spring/integration/spring-integration-context.xml",
34+
new ClassPathXmlApplicationContext("/META-INF/spring/integration/spring-integration-context.xml",
3635
StringConversionServiceTest.class);
3736
Thread.sleep(2000);
3837
}

‎si-template-projects/si-template-war-project/src/main/java/stsorg/stsspringframework/stsintegration/model/TwitterMessage.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2010 the original author or authors
2+
* Copyright 2002-2012 the original author or authors
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎si-template-projects/si-template-war-project/src/main/java/stsorg/stsspringframework/stsintegration/mvc/controller/HomeController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2010 the original author or authors
2+
* Copyright 2002-2012 the original author or authors
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎si-template-projects/si-template-war-project/src/main/java/stsorg/stsspringframework/stsintegration/service/TwitterService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2010 the original author or authors
2+
* Copyright 2002-2012 the original author or authors
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎si-template-projects/si-template-war-project/src/main/java/stsorg/stsspringframework/stsintegration/service/impl/DefaultTwitterService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2010 the original author or authors
2+
* Copyright 2002-2012 the original author or authors
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎si-template-projects/si-template-war-project/src/test/java/stsorg/stsspringframework/stsintegration/SpringIntegrationTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2010 the original author or authors.
2+
* Copyright 2002-2012 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)