Skip to content

Commit 329a56d

Browse files
scottkurzscottkurz
committed
Add support for configuration of runtime services via System properties. Collapse SE vs EE Maven profiles into one. Collapse SE and EE batch-config.properties into one too.
1 parent be9ba4c commit 329a56d

19 files changed

+748
-748
lines changed

‎.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ idea
1919
*.swp
2020
*~
2121

22-
/com.ibm.jbatch.container/src/main/resources/META-INF/services/*.properties
2322
/com.ibm.jbatch.container/derby.log
2423
/com.ibm.jbatch.container/RUNTIMEDB
2524
RUNTIMEDB

‎com.ibm.jbatch.container/pom.xml

+121-207
Original file line numberDiff line numberDiff line change
@@ -54,216 +54,130 @@
5454
<scope>test</scope>
5555
</dependency>
5656
</dependencies>
57-
58-
<profiles>
59-
<profile>
60-
<id>JavaEE</id>
61-
<build>
62-
<resources>
63-
<resource>
64-
<directory>src/main/resources</directory>
65-
<excludes>
66-
<exclude>*-properties/**</exclude>
67-
</excludes>
68-
</resource>
69-
</resources>
70-
<plugins>
71-
<plugin>
72-
<groupId>org.apache.maven.plugins</groupId>
73-
<artifactId>maven-compiler-plugin</artifactId>
74-
</plugin>
75-
<plugin>
76-
<groupId>org.apache.maven.plugins</groupId>
77-
<artifactId>maven-resources-plugin</artifactId>
78-
</plugin>
79-
<plugin>
80-
<groupId>org.codehaus.mojo</groupId>
81-
<artifactId>jaxb2-maven-plugin</artifactId>
82-
<executions>
83-
<execution>
84-
<id>xjc</id>
85-
<goals>
86-
<goal>xjc</goal>
87-
</goals>
88-
<configuration>
89-
<schemaDirectory>src/main/resources/xsd</schemaDirectory>
90-
<schemaFiles>jobXML_1_0.xsd</schemaFiles>
91-
<target>2.1</target>
92-
</configuration>
93-
</execution>
94-
</executions>
95-
</plugin>
96-
<plugin>
97-
<groupId>org.apache.maven.plugins</groupId>
98-
<artifactId>maven-jar-plugin</artifactId>
57+
<build>
58+
<plugins>
59+
<plugin>
60+
<groupId>org.apache.maven.plugins</groupId>
61+
<artifactId>maven-compiler-plugin</artifactId>
62+
</plugin>
63+
<plugin>
64+
<groupId>org.apache.maven.plugins</groupId>
65+
<artifactId>maven-resources-plugin</artifactId>
66+
</plugin>
67+
<plugin>
68+
<groupId>org.codehaus.mojo</groupId>
69+
<artifactId>properties-maven-plugin</artifactId>
70+
<version>1.0-alpha-2</version>
71+
<executions>
72+
<execution>
73+
<id>set-additional-system-properties</id>
74+
<goals>
75+
<goal>set-system-properties</goal>
76+
</goals>
9977
<configuration>
100-
<archive>
101-
<manifestFile>META-INF/MANIFEST.MF</manifestFile>
102-
</archive>
78+
<properties>
79+
<property>
80+
<name>javax.xml.accessExternalSchema</name>
81+
<value>file</value>
82+
</property>
83+
</properties>
10384
</configuration>
104-
</plugin>
105-
<plugin>
106-
<artifactId>maven-antrun-plugin</artifactId>
107-
<executions>
108-
<execution>
109-
<phase>validate</phase>
110-
<configuration>
111-
<tasks>
112-
<echo>Java EE Build</echo>
113-
<copy overwrite="true"
114-
file="src/main/resources/jee-properties/batch-config.properties"
115-
tofile="src/main/resources/META-INF/services/batch-config.properties" />
116-
<copy overwrite="true"
117-
file="src/main/resources/jee-properties/batch-services.properties"
118-
tofile="src/main/resources/META-INF/services/batch-services.properties" />
119-
</tasks>
120-
</configuration>
121-
<goals>
122-
<goal>run</goal>
123-
</goals>
124-
</execution>
125-
<execution>
126-
<id>ant-process-sources</id>
127-
<phase>process-sources</phase>
128-
<configuration>
129-
<tasks>
130-
<echo>Adjusting generated JAXBs</echo>
131-
<ant antfile="${basedir}/adjustJAXB/build.xml" />
132-
</tasks>
133-
</configuration>
134-
<goals>
135-
<goal>run</goal>
136-
</goals>
137-
</execution>
138-
</executions>
139-
<dependencies>
140-
<dependency>
141-
<groupId>ant</groupId>
142-
<artifactId>ant-nodeps</artifactId>
143-
<version>${version.ant.ant-nodeps}</version>
144-
</dependency>
145-
</dependencies>
146-
</plugin>
147-
</plugins>
148-
</build>
149-
</profile>
150-
<profile>
151-
<id>JavaSE</id>
152-
153-
<activation>
154-
<activeByDefault>true</activeByDefault>
155-
</activation>
156-
157-
<build>
158-
<resources>
159-
<resource>
160-
<directory>src/main/resources</directory>
161-
<excludes>
162-
<exclude>*-properties/**</exclude>
163-
</excludes>
164-
</resource>
165-
</resources>
166-
<plugins>
167-
<plugin>
168-
<groupId>org.apache.maven.plugins</groupId>
169-
<artifactId>maven-compiler-plugin</artifactId>
170-
</plugin>
171-
<plugin>
172-
<groupId>org.apache.maven.plugins</groupId>
173-
<artifactId>maven-resources-plugin</artifactId>
174-
</plugin>
175-
<plugin>
176-
<groupId>org.codehaus.mojo</groupId>
177-
<artifactId>properties-maven-plugin</artifactId>
178-
<version>1.0-alpha-2</version>
179-
<executions>
180-
<execution>
181-
<id>set-additional-system-properties</id>
182-
<goals>
183-
<goal>set-system-properties</goal>
184-
</goals>
185-
<configuration>
186-
<properties>
187-
<property>
188-
<name>javax.xml.accessExternalSchema</name>
189-
<value>file</value>
190-
</property>
191-
</properties>
192-
</configuration>
193-
</execution>
194-
</executions>
195-
</plugin>
196-
<plugin>
197-
<groupId>org.codehaus.mojo</groupId>
198-
<artifactId>jaxb2-maven-plugin</artifactId>
199-
<executions>
200-
<execution>
201-
<id>xjc</id>
202-
<goals>
203-
<goal>xjc</goal>
204-
</goals>
205-
<configuration>
206-
<schemaDirectory>src/main/resources/xsd</schemaDirectory>
207-
<schemaFiles>jobXML_1_0.xsd</schemaFiles>
208-
<target>2.1</target>
209-
</configuration>
210-
</execution>
211-
</executions>
212-
</plugin>
213-
<plugin>
214-
<groupId>org.apache.maven.plugins</groupId>
215-
<artifactId>maven-jar-plugin</artifactId>
85+
</execution>
86+
</executions>
87+
</plugin>
88+
<plugin>
89+
<groupId>org.codehaus.mojo</groupId>
90+
<artifactId>jaxb2-maven-plugin</artifactId>
91+
<executions>
92+
<execution>
93+
<id>xjc</id>
94+
<goals>
95+
<goal>xjc</goal>
96+
</goals>
97+
<configuration>
98+
<schemaDirectory>src/main/resources/xsd</schemaDirectory>
99+
<schemaFiles>jobXML_1_0.xsd</schemaFiles>
100+
<target>2.1</target>
101+
</configuration>
102+
</execution>
103+
</executions>
104+
</plugin>
105+
<plugin>
106+
<groupId>org.apache.maven.plugins</groupId>
107+
<artifactId>maven-jar-plugin</artifactId>
108+
<configuration>
109+
<archive>
110+
<manifestFile>META-INF/MANIFEST.MF</manifestFile>
111+
</archive>
112+
</configuration>
113+
</plugin>
114+
<plugin>
115+
<artifactId>maven-antrun-plugin</artifactId>
116+
<executions>
117+
<execution>
118+
<id>ant-process-sources</id>
119+
<phase>process-sources</phase>
216120
<configuration>
217-
<archive>
218-
<manifestFile>META-INF/MANIFEST.MF</manifestFile>
219-
</archive>
121+
<tasks>
122+
<echo>Adjusting generated JAXBs</echo>
123+
<ant antfile="${basedir}/adjustJAXB/build.xml" />
124+
</tasks>
220125
</configuration>
221-
</plugin>
222-
<plugin>
223-
<artifactId>maven-antrun-plugin</artifactId>
224-
<executions>
225-
<execution>
226-
<phase>validate</phase>
227-
<configuration>
228-
<tasks>
229-
<echo>Java SE Build</echo>
230-
<copy overwrite="true"
231-
file="src/main/resources/se-properties/META-INF/services/batch-config.properties"
232-
tofile="src/main/resources/META-INF/services/batch-config.properties" />
233-
<copy overwrite="true"
234-
file="src/main/resources/se-properties/META-INF/services/batch-services.properties"
235-
tofile="src/main/resources/META-INF/services/batch-services.properties" />
236-
</tasks>
237-
</configuration>
238-
<goals>
239-
<goal>run</goal>
240-
</goals>
241-
</execution>
242-
<execution>
243-
<id>ant-process-sources</id>
244-
<phase>process-sources</phase>
245-
<configuration>
246-
<tasks>
247-
<echo>Adjusting generated JAXBs</echo>
248-
<ant antfile="${basedir}/adjustJAXB/build.xml" />
249-
</tasks>
250-
</configuration>
251-
<goals>
252-
<goal>run</goal>
253-
</goals>
254-
</execution>
255-
</executions>
256-
<dependencies>
257-
<dependency>
258-
<groupId>ant</groupId>
259-
<artifactId>ant-nodeps</artifactId>
260-
<version>${version.ant.ant-nodeps}</version>
261-
</dependency>
262-
</dependencies>
263-
</plugin>
264-
</plugins>
265-
</build>
266-
</profile>
267-
</profiles>
126+
<goals>
127+
<goal>run</goal>
128+
</goals>
129+
</execution>
130+
</executions>
131+
<dependencies>
132+
<dependency>
133+
<groupId>ant</groupId>
134+
<artifactId>ant-nodeps</artifactId>
135+
<version>${version.ant.ant-nodeps}</version>
136+
</dependency>
137+
</dependencies>
138+
</plugin>
139+
<plugin>
140+
<groupId>org.apache.maven.plugins</groupId>
141+
<artifactId>maven-failsafe-plugin</artifactId>
142+
<executions>
143+
<execution>
144+
<goals>
145+
<goal>integration-test</goal>
146+
<goal>verify</goal>
147+
</goals>
148+
</execution>
149+
</executions>
150+
<configuration>
151+
<!-- Must be false for tests of service manager/registry since they assume they are not dealing with an earlier config from another test -->
152+
<reuseForks>false</reuseForks>
153+
</configuration>
154+
</plugin>
155+
<plugin>
156+
<groupId>org.apache.maven.plugins</groupId>
157+
<artifactId>maven-surefire-plugin</artifactId>
158+
<!--
159+
<executions>
160+
<execution>
161+
<id>api-tests</id>
162+
<goals>
163+
<goal>test</goal>
164+
</goals>
165+
-->
166+
<configuration>
167+
<!--
168+
-->
169+
<systemPropertyVariables>
170+
<com.ibm.jbatch.spi.ServiceRegistry.J2SE_MODE>true</com.ibm.jbatch.spi.ServiceRegistry.J2SE_MODE>
171+
<com.ibm.jbatch.spi.ServiceRegistry.BATCH_THREADPOOL_SERVICE>com.ibm.jbatch.container.services.impl.GrowableThreadPoolServiceImpl</com.ibm.jbatch.spi.ServiceRegistry.BATCH_THREADPOOL_SERVICE>
172+
<com.ibm.jbatch.spi.ServiceRegistry.CONTAINER_ARTIFACT_FACTORY_SERVICE>com.ibm.jbatch.container.services.impl.DelegatingBatchArtifactFactoryImpl</com.ibm.jbatch.spi.ServiceRegistry.CONTAINER_ARTIFACT_FACTORY_SERVICE>
173+
</systemPropertyVariables>
174+
</configuration>
175+
<!--
176+
</execution>
177+
</executions>
178+
-->
179+
</plugin>
180+
</plugins>
181+
</build>
268182
</project>
269183

0 commit comments

Comments
 (0)