Skip to content

Commit d46ebd7

Browse files
jfdenisejfdenise
committed
Exclude layers tests, ignore excluded layer from default config
1 parent 91d9218 commit d46ebd7

File tree

7 files changed

+346
-1
lines changed

7 files changed

+346
-1
lines changed

‎jboss/container/eap/galleon/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/src/main/resources/configs/standalone/standalone.xml/config.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
<config xmlns="urn:jboss:galleon:config:1.0" name="standalone.xml" model="standalone">
44
<layers>
55
<!-- we already have all required in default config -->
6-
<exclude name="operator-required"/>
6+
<!-- Although logically correct, galleon doesn't actually support excluding from model -->
7+
<!-- This is harmeless, keeping the exclusion commented for reference until GAL-308 is fixed -->
8+
<!--<exclude name="operator-required"/>-->
79
<include name="amq6-rar"/>
810
</layers>
911

‎tests/examples/test-app-jaxrs-exclude/galleon/provisioning.xml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" ?>
2+
3+
<installation xmlns="urn:jboss:galleon:provisioning:3.0">
4+
<feature-pack location="eap-s2i@maven(org.jboss.universe:s2i-universe)">
5+
<default-configs inherit="false"/>
6+
<packages inherit="false"/>
7+
</feature-pack>
8+
<config model="standalone" name="standalone.xml">
9+
<layers>
10+
<include name="jaxrs-server"/>
11+
<include name="observability"/>
12+
<exclude name="open-tracing"/>
13+
</layers>
14+
</config>
15+
<options>
16+
<option name="optional-packages" value="passive+"/>
17+
</options>
18+
</installation>

‎tests/examples/test-app-jaxrs-exclude/pom.xml‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
JBoss, Home of Professional Open Source
4+
Copyright 2015, Red Hat, Inc. and/or its affiliates, and individual
5+
contributors by the @authors tag. See the copyright.txt in the
6+
distribution for a full listing of individual contributors.
7+
8+
Licensed under the Apache License, Version 2.0 (the "License");
9+
you may not use this file except in compliance with the License.
10+
You may obtain a copy of the License at
11+
http://www.apache.org/licenses/LICENSE-2.0
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
-->
18+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
20+
<modelVersion>4.0.0</modelVersion>
21+
22+
<groupId>openshift-test-examples</groupId>
23+
<artifactId>jaxrs</artifactId>
24+
<packaging>war</packaging>
25+
<version>1.0</version>
26+
<name>OpenshiftExamples</name>
27+
28+
<properties>
29+
<maven.compiler.source>1.8</maven.compiler.source>
30+
<maven.compiler.target>1.8</maven.compiler.target>
31+
</properties>
32+
33+
<description>This project demonstrates how to implement a JAX-RS service</description>
34+
35+
<licenses>
36+
<license>
37+
<name>Apache License, Version 2.0</name>
38+
<url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
39+
<distribution>repo</distribution>
40+
</license>
41+
</licenses>
42+
43+
<dependencies>
44+
<!-- Import the JAX-RS API, we use provided scope as the API is included in JBoss EAP -->
45+
<dependency>
46+
<groupId>org.jboss.spec.javax.ws.rs</groupId>
47+
<artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
48+
<version>1.0.1.Final</version>
49+
<scope>provided</scope>
50+
</dependency>
51+
52+
</dependencies>
53+
54+
<profiles>
55+
<profile>
56+
<!-- When built in OpenShift the 'openshift' profile will be used when invoking mvn. -->
57+
<!-- Use this profile for any OpenShift specific customization your app will need. -->
58+
<!-- By default that is to put the resulting archive into the 'deployments' folder. -->
59+
<!-- http://maven.apache.org/guides/mini/guide-building-for-different-environments.html -->
60+
<id>openshift</id>
61+
<build>
62+
<finalName>DemoApp</finalName>
63+
<plugins>
64+
<plugin>
65+
<groupId>org.apache.maven.plugins</groupId>
66+
<artifactId>maven-war-plugin</artifactId>
67+
<version>2.3</version>
68+
<configuration>
69+
<failOnMissingWebXml>false</failOnMissingWebXml>
70+
<outputDirectory>target</outputDirectory>
71+
<warName>ROOT</warName>
72+
</configuration>
73+
</plugin>
74+
</plugins>
75+
</build>
76+
</profile>
77+
</profiles>
78+
</project>

‎tests/examples/test-app-jaxrs-exclude/src/main/java/org/jboss/galleon/demo/Message.java‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
/*
2+
* JBoss, Home of Professional Open Source
3+
* Copyright 2019, Red Hat, Inc. and/or its affiliates, and individual
4+
* contributors by the @authors tag. See the copyright.txt in the
5+
* distribution for a full listing of individual contributors.
6+
*
7+
* Licensed under the Apache License, Version 2.0 (the "License");
8+
* you may not use this file except in compliance with the License.
9+
* You may obtain a copy of the License at
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
package org.jboss.galleon.demo;
18+
19+
/**
20+
*
21+
* @author [email protected]
22+
*/
23+
public class Message {
24+
public String getResource() {
25+
return "JAXRS resource";
26+
}
27+
public String getServer() {
28+
return "WildFly provisioned with Galleon jaxrs-server layer";
29+
}
30+
}

‎tests/examples/test-app-jaxrs-exclude/src/main/java/org/jboss/galleon/demo/Resource.java‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
/*
2+
* JBoss, Home of Professional Open Source
3+
* Copyright 2019, Red Hat, Inc. and/or its affiliates, and individual
4+
* contributors by the @authors tag. See the copyright.txt in the
5+
* distribution for a full listing of individual contributors.
6+
*
7+
* Licensed under the Apache License, Version 2.0 (the "License");
8+
* you may not use this file except in compliance with the License.
9+
* You may obtain a copy of the License at
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
package org.jboss.galleon.demo;
18+
19+
import javax.ws.rs.GET;
20+
import javax.ws.rs.Path;
21+
import javax.ws.rs.Produces;
22+
23+
/**
24+
* A JAX-RS resource for exposing REST endpoint.
25+
*/
26+
@Path("/")
27+
public class Resource {
28+
29+
@GET
30+
@Produces({"application/json"})
31+
public Message getMessage() {
32+
return new Message();
33+
}
34+
}

‎tests/examples/test-app-jaxrs-exclude/src/main/webapp/WEB-INF/web.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<!--
2+
JBoss, Home of Professional Open Source
3+
Copyright 2015, Red Hat, Inc. and/or its affiliates, and individual
4+
contributors by the @authors tag. See the copyright.txt in the
5+
distribution for a full listing of individual contributors.
6+
7+
Licensed under the Apache License, Version 2.0 (the "License");
8+
you may not use this file except in compliance with the License.
9+
You may obtain a copy of the License at
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
-->
17+
<web-app version="3.1" xmlns="http://xmlns.jcp.org/xml/ns/javaee"
18+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19+
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd">
20+
<!-- One of the way of activating REST Services is adding these lines, the server is responsible for adding the corresponding servlet automatically. If the src folder, org.jboss.as.quickstarts.rshelloworld.HelloWorld class has the Annotations to receive REST invocation-->
21+
<servlet-mapping>
22+
<servlet-name>javax.ws.rs.core.Application</servlet-name>
23+
<url-pattern>/*</url-pattern>
24+
</servlet-mapping>
25+
</web-app>

0 commit comments

Comments
 (0)