Skip to content

Commit

Permalink
[resolves #2395] Fix .editorconfig violations by running mvn
Browse files Browse the repository at this point in the history
editorconfig:format -Dts.all
  • Loading branch information
ppalaga committed Jan 22, 2018
1 parent 790ffd9 commit e501366
Show file tree
Hide file tree
Showing 443 changed files with 2,152 additions and 2,152 deletions.
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
*.properties text
*.sh text
*.txt text
*.xml text
*.xml text
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Your Enterprise Integration Solution can be architected as a combination of Java

### Documentation

The docs are generated using [Asciidoctor](http://asciidoctor.org/docs).
The docs are generated using [Asciidoctor](http://asciidoctor.org/docs).

* [User Guide](http://wildfly-extras.github.io/wildfly-camel)
* [JavaEE Integration](http://wildfly-extras.github.io/wildfly-camel/#_javaee_integration)
Expand All @@ -24,7 +24,7 @@ The docs are generated using [Asciidoctor](http://asciidoctor.org/docs).
To generate an update of the docs use:

```
$ mvn clean install -f docs
$ mvn clean install -f docs
```

If you like to contribute to the docs, please file a [pull request](https://github.com/wildfly-extras/wildfly-camel) against the master branch.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
WildFly Camel CDI Web Application
=============

This is a template Apache Camel CDI application for the WildFly Camel subsystem.
This is a template Apache Camel CDI application for the WildFly Camel subsystem.

This project is setup to allow you to create a Apache Camel CDI application, which can be deployed to an application
server running the WildFly Camel subsystem. An example CDI Camel Route has been created for you, together with an Arquillian
Expand Down Expand Up @@ -45,7 +45,7 @@ To build the application do:

Run Arquillian Tests
--------------------

By default, tests are configured to be skipped as Arquillian requires the use of a container.

If you already have a running application server, you can run integration tests with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public class MyTest {

@Inject
CamelContext camelContext;

@Deployment
public static WebArchive createDeployment() {
final WebArchive archive = ShrinkWrap.create(WebArchive.class, "camel-tests.war");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand All @@ -20,9 +20,9 @@
-->
<arquillian xmlns="http://jboss.org/schema/arquillian" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">

<defaultProtocol type="jmx-as7" />

<container qualifier="managed" default="true">
<configuration>
<property name="jbossHome">${jboss.home}</property>
Expand All @@ -31,5 +31,5 @@
<property name="allowConnectingToRunningServer">true</property>
</configuration>
</container>

</arquillian>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
WildFly Camel Spring XML Web Application
=============

This is a template Apache Camel Spring application for the WildFly Camel subsystem.
This is a template Apache Camel Spring application for the WildFly Camel subsystem.

This project is setup to allow you to create a Apache Camel Spring application, which can be deployed to an application
server running the WildFly Camel subsystem. An example Spring XML Camel Route has been created for you, together with an Arquillian
Expand Down Expand Up @@ -45,7 +45,7 @@ To build the application do:

Run Arquillian Tests
--------------------

By default, tests are configured to be skipped as Arquillian requires the use of a container.

If you already have a running application server, you can run integration tests with:
Expand Down Expand Up @@ -83,7 +83,7 @@ Undeploying the application
---------------------------

mvn wildfly:undeploy


Further reading
---------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand All @@ -20,9 +20,9 @@
-->
<arquillian xmlns="http://jboss.org/schema/arquillian" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">

<defaultProtocol type="jmx-as7" />

<container qualifier="managed" default="true">
<configuration>
<property name="jbossHome">${jboss.home}</property>
Expand All @@ -31,5 +31,5 @@
<property name="allowConnectingToRunningServer">true</property>
</configuration>
</container>

</arquillian>
10 changes: 5 additions & 5 deletions catalog/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand All @@ -30,7 +30,7 @@
</parent>

<name>Wildfly Camel :: Catalog</name>

<artifactId>wildfly-camel-catalog</artifactId>

<dependencyManagement>
Expand All @@ -44,7 +44,7 @@
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.wildfly.camel</groupId>
Expand Down Expand Up @@ -126,7 +126,7 @@
<key>basedir</key>
<value>${basedir}</value>
</property>
</systemProperties>
</systemProperties>
</configuration>
</execution>
</executions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ boolean validKind(String kind, JsonNode node) {
}
});

// Change state when planned or rejected
// Change state when planned or rejected
for (RoadMap roadmap : ROAD_MAPS.values()) {
State state = null;
File file = roadmap.outpath.toFile();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ public final class CatalogCreatorTest {

@Test
public void createCatalog() throws Exception {

CatalogCreator creator = new CatalogCreator().collect();
List<RoadMap> roadmaps = creator.getRoadmaps();
Assert.assertEquals(4, roadmaps.size());

RoadMap roadmap = creator.getRoadmap(Kind.other);
Assert.assertNotNull("Other roadmap not null", roadmap);

Item item = roadmap.item("opentracing");
Assert.assertNotNull("Item not null", item);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@ public final class GenerateRoadmapIssuesTest {

private static final String MILESTONE = "4.8.0";
private static final Label LABEL = new Label().setName("feature");

private static final Path auxfile = CatalogCreator.basedir().resolve("target/issues.txt");

@Test
public void createIssuesStepA() throws Exception {

CatalogCreator creator = new CatalogCreator().collect();

List<String> collection = new ArrayList<>();
for (RoadMap rm : creator.getRoadmaps()) {
String prefix = null;
Expand Down Expand Up @@ -89,13 +89,13 @@ public void createIssuesStepB() throws Exception {

String accessToken = System.getenv("GitHubAccessToken");
Assume.assumeNotNull("GitHubAccessToken not null", accessToken);

GitHubClient client = new GitHubClient();
client.setOAuth2Token(accessToken);

String githubUser = "wildfly-extras";
String githubRepo = "wildfly-camel";

Milestone milestone = null;
MilestoneService milestoneService = new MilestoneService(client);
for (Milestone aux : milestoneService.getMilestones(githubUser, githubRepo, IssueService.STATE_OPEN)) {
Expand All @@ -105,7 +105,7 @@ public void createIssuesStepB() throws Exception {
}
}
Assert.assertNotNull("Milestone not null", milestone);

IssueService issueService = new IssueService(client);
try (BufferedReader br = new BufferedReader(new FileReader(auxfile.toFile()))) {
String line = br.readLine();
Expand All @@ -123,4 +123,4 @@ public void createIssuesStepB() throws Exception {
}
}

}
}
4 changes: 2 additions & 2 deletions config/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
-->
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.wildfly.camel</groupId>
<artifactId>wildfly-camel</artifactId>
Expand All @@ -41,7 +41,7 @@
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.wildfly.extras.patch</groupId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
org.wildfly.extension.camel.config.WildFlyCamelConfigPlugin
org.wildfly.extension.camel.config.WildFlyCamelConfigPlugin
2 changes: 1 addition & 1 deletion config/src/main/resources/camel-subsystem.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
]]>
</camelContext>
-->
</subsystem>
</subsystem>
2 changes: 1 addition & 1 deletion config/src/main/resources/hawtio-security-domain.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
<module-option name="realm" value="ManagementRealm"/>
</login-module>
</authentication>
</security-domain>
</security-domain>
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,4 @@ public void outputDocumentContent(Document document, OutputStream stream) throws
output.setFormat(Format.getRawFormat());
output.output(document, stream);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -152,4 +152,4 @@ public void testRemoveConfig() throws Exception {
// Verify hawtio-domain removed
assertElementWithAttributeValueNull(doc.getRootElement(), "security-domain", "name", "hawtio-domain", NS_SECURITY);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public void testVersions() throws Exception {
}

public String getTargetValue(String wfcKey) throws JDOMException {

Element rootNode;
if (wfcKey.startsWith("version.camel.")) {
rootNode = camelRoot;
Expand Down Expand Up @@ -129,4 +129,4 @@ private Element getRootNode(String pomKey) throws IOException, JDOMException {
Document document = (Document) builder.build(xmlFile);
return document.getRootElement();
}
}
}
4 changes: 2 additions & 2 deletions cxfhttp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
-->
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.wildfly.camel</groupId>
<artifactId>wildfly-camel</artifactId>
Expand All @@ -40,7 +40,7 @@
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.apache.cxf</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ public interface HttpServerEngine {

void removeServant(URL nurl);

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ public interface HttpServerEngineFactory {

AbstractHTTPServerEngine createHTTPServerEngine(String host, int port, String protocol);

}
}
6 changes: 3 additions & 3 deletions docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
Details about the WildFly CentOS image are described [here](https://github.com/openshift/openshift-docs/blob/master/using_images/s2i_images/wildfly.adoc).

minishift delete
minishift start --vm-driver=virtualbox --memory 12048 --cpus 3
minishift start --vm-driver=virtualbox --memory 12048 --cpus 3
eval $(minishift docker-env)

Build the WildFly Camel docker image

mvn clean install -Ddocker -pl docker -am

Run the WildFly Camel docker image

docker run --rm -ti -e WILDFLY_MANAGEMENT_USER=admin -e WILDFLY_MANAGEMENT_PASSWORD=admin -p 8080:8080 -p 9990:9990 wildflyext/wildfly-camel

Test access to the console http://192.168.99.100:9990/console and to hawtio http://192.168.99.100:8080/hawtio

Loading

0 comments on commit e501366

Please sign in to comment.