Skip to content

Commit bcad431

Browse files
author
Emanuel Muckenhuber
committed
rename ServerManager to HostController and ProcessManager to ProcessController
1 parent 2e9bf39 commit bcad431

File tree

138 files changed

+966
-965
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+966
-965
lines changed

Diff for: ‎build/build.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,10 @@
216216
<module-def name="org.jboss.as.domain-controller">
217217
<maven-resource group="org.jboss.as" artifact="jboss-as-domain-controller"/>
218218
</module-def>
219+
220+
<module-def name="org.jboss.as.host-controller">
221+
<maven-resource group="org.jboss.as" artifact="jboss-as-host-controller"/>
222+
</module-def>
219223

220224
<module-def name="org.jboss.as.jmx">
221225
<maven-resource group="org.jboss.as" artifact="jboss-as-jmx"/>
@@ -241,8 +245,8 @@
241245
<maven-resource group="org.jboss.as" artifact="jboss-as-osgi"/>
242246
</module-def>
243247

244-
<module-def name="org.jboss.as.process-manager">
245-
<maven-resource group="org.jboss.as" artifact="jboss-as-process-manager"/>
248+
<module-def name="org.jboss.as.process-controller">
249+
<maven-resource group="org.jboss.as" artifact="jboss-as-process-controller"/>
246250
</module-def>
247251

248252
<module-def name="org.jboss.as.protocol">
@@ -261,10 +265,6 @@
261265
<maven-resource group="org.jboss.as" artifact="jboss-as-server"/>
262266
</module-def>
263267

264-
<module-def name="org.jboss.as.server-manager">
265-
<maven-resource group="org.jboss.as" artifact="jboss-as-server-manager"/>
266-
</module-def>
267-
268268
<module-def name="org.jboss.as.standalone"/>
269269

270270
<module-def name="org.jboss.as.standalone-client">

Diff for: ‎build/pom.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,11 @@
183183
<artifactId>jboss-as-jmx</artifactId>
184184
</dependency>
185185

186+
<dependency>
187+
<groupId>org.jboss.as</groupId>
188+
<artifactId>jboss-as-host-controller</artifactId>
189+
</dependency>
190+
186191
<dependency>
187192
<groupId>org.jboss.as</groupId>
188193
<artifactId>jboss-as-logging</artifactId>
@@ -215,7 +220,7 @@
215220

216221
<dependency>
217222
<groupId>org.jboss.as</groupId>
218-
<artifactId>jboss-as-process-manager</artifactId>
223+
<artifactId>jboss-as-process-controller</artifactId>
219224
</dependency>
220225

221226
<dependency>
@@ -233,11 +238,6 @@
233238
<artifactId>jboss-as-server</artifactId>
234239
</dependency>
235240

236-
<dependency>
237-
<groupId>org.jboss.as</groupId>
238-
<artifactId>jboss-as-server-manager</artifactId>
239-
</dependency>
240-
241241
<dependency>
242242
<groupId>org.jboss.as</groupId>
243243
<artifactId>jboss-as-threads</artifactId>

Diff for: ‎build/src/main/resources/bin/domain.bat

+3-3
Original file line numberDiff line numberDiff line change
@@ -85,16 +85,16 @@ echo.
8585

8686
:RESTART
8787
"%JAVA%" %JAVA_OPTS% ^
88-
-Dorg.jboss.boot.log.file=%JBOSS_HOME%\process-manager\log\boot.log ^
88+
-Dorg.jboss.boot.log.file=%JBOSS_HOME%\process-controller\log\boot.log ^
8989
-Dlogging.configuration=file:%JBOSS_HOME%/domain/configuration/logging.properties ^
9090
-jar "%JBOSS_HOME%\jboss-modules.jar" ^
9191
-mp "%JBOSS_HOME%\modules" ^
9292
-logmodule "org.jboss.logmanager" ^
93-
org.jboss.as.process-manager ^
93+
org.jboss.as.process-controller ^
9494
-jboss-home "%JBOSS_HOME%" ^
9595
-jvm "%JAVA%" ^
9696
-- ^
97-
-Dorg.jboss.boot.log.file=%JBOSS_HOME%\domain\log\server-manager\boot.log ^
97+
-Dorg.jboss.boot.log.file=%JBOSS_HOME%\domain\log\host-controller\boot.log ^
9898
-Dlogging.configuration=file:%JBOSS_HOME%/domain/configuration/logging.properties ^
9999
%JAVA_OPTS% ^
100100
-- ^

Diff for: ‎build/src/main/resources/bin/domain.sh

+11-12
Original file line numberDiff line numberDiff line change
@@ -133,16 +133,16 @@ while true; do
133133
if [ "x$LAUNCH_JBOSS_IN_BACKGROUND" = "x" ]; then
134134
# Execute the JVM in the foreground
135135
eval \"$JAVA\" $JAVA_OPTS \
136-
-Dorg.jboss.boot.log.file=$JBOSS_HOME/domain/log/process-manager/boot.log \
136+
-Dorg.jboss.boot.log.file=$JBOSS_HOME/domain/log/process-controller/boot.log \
137137
-Dlogging.configuration=file:$JBOSS_HOME/domain/configuration/logging.properties \
138138
-jar \"$JBOSS_HOME/jboss-modules.jar\" \
139139
-mp \"$JBOSS_HOME/modules\" \
140140
-logmodule "org.jboss.logmanager" \
141-
org.jboss.as.process-manager \
141+
org.jboss.as.process-controller \
142142
-jboss-home "$JBOSS_HOME" \
143143
-jvm \"$JAVA\" \
144144
-- \
145-
-Dorg.jboss.boot.log.file=$JBOSS_HOME/domain/log/server-manager/boot.log \
145+
-Dorg.jboss.boot.log.file=$JBOSS_HOME/domain/log/host-controller/boot.log \
146146
-Dlogging.configuration=file:$JBOSS_HOME/domain/configuration/logging.properties \
147147
$JAVA_OPTS \
148148
-- \
@@ -152,20 +152,19 @@ while true; do
152152
else
153153
# Execute the JVM in the background
154154
eval \"$JAVA\" $JAVA_OPTS \
155-
-Dorg.jboss.boot.log.file=$JBOSS_HOME/domain/log/process-manager/boot.log \
155+
-Dorg.jboss.boot.log.file=$JBOSS_HOME/domain/log/process-controller/boot.log \
156156
-Dlogging.configuration=file:$JBOSS_HOME/domain/configuration/logging.properties \
157157
-jar \"$JBOSS_HOME/jboss-modules.jar\" \
158158
-mp \"$JBOSS_HOME/modules\" \
159159
-logmodule "org.jboss.logmanager" \
160-
org.jboss.as.process-manager \
161-
-Dorg.jboss.boot.log.file=$JBOSS_HOME/domain/log/server-manager/boot.log \
160+
org.jboss.as.process-controller \
161+
-jboss-home "$JBOSS_HOME" \
162+
-jvm \"$JAVA\" \
163+
-- \
164+
-Dorg.jboss.boot.log.file=$JBOSS_HOME/domain/log/host-controller/boot.log \
162165
-Dlogging.configuration=file:$JBOSS_HOME/domain/configuration/logging.properties \
163-
"$JBOSS_HOME" \
164-
\"$JAVA\" $JAVA_OPTS \
165-
-jar \"$JBOSS_HOME/jboss-modules.jar\" \
166-
-mp \"$JBOSS_HOME/modules\" \
167-
-logmodule "org.jboss.logmanager" \
168-
org.jboss.as.server-manager \
166+
$JAVA_OPTS \
167+
-- \
169168
-default-jvm \"$JAVA\" \
170169
"$@" "&"
171170
JBOSS_PID=$!

Diff for: ‎build/src/main/resources/modules/org/jboss/as/server-manager/main/module.xml renamed to ‎build/src/main/resources/modules/org/jboss/as/host-controller/main/module.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
2323
-->
2424

25-
<module xmlns="urn:jboss:module:1.0" name="org.jboss.as.server-manager">
25+
<module xmlns="urn:jboss:module:1.0" name="org.jboss.as.host-controller">
2626

27-
<main-class name="org.jboss.as.server.manager.Main"/>
27+
<main-class name="org.jboss.as.host.controller.Main"/>
2828

2929
<resources>
3030
<!-- Insert resources here -->
@@ -36,7 +36,7 @@
3636
<module name="org.jboss.as.domain"/>
3737
<module name="org.jboss.as.domain-client"/>
3838
<module name="org.jboss.as.domain-controller"/>
39-
<module name="org.jboss.as.process-manager"/>
39+
<module name="org.jboss.as.process-controller"/>
4040
<module name="org.jboss.as.protocol"/>
4141
<module name="org.jboss.as.server"/>
4242
<module name="org.jboss.as.threads"/>

Diff for: ‎build/src/main/resources/modules/org/jboss/as/process-manager/main/module.xml renamed to ‎build/src/main/resources/modules/org/jboss/as/process-controller/main/module.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
2323
-->
2424

25-
<module xmlns="urn:jboss:module:1.0" name="org.jboss.as.process-manager">
25+
<module xmlns="urn:jboss:module:1.0" name="org.jboss.as.process-controller">
2626

2727
<main-class name="org.jboss.as.process.Main"/>
2828

Diff for: ‎build/src/main/resources/modules/org/jboss/as/server/main/module.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<module name="org.jboss.as.logging"/>
4747
<module name="org.jboss.as.naming"/>
4848
<module name="org.jboss.as.osgi"/>
49-
<module name="org.jboss.as.process-manager"/>
49+
<module name="org.jboss.as.process-controller"/>
5050
<module name="org.jboss.as.protocol"/>
5151
<module name="org.jboss.as.remoting"/>
5252
<module name="org.jboss.as.threads"/>

Diff for: ‎demos/build.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@
4545
<echo> web.connector - creates and removes a jboss web connector</echo>
4646
<echo/>
4747
<echo>Valid example names to run against a JBoss AS domain are</echo>
48-
<echo> domain.configs - reads the domain config and any available server manager configs</echo>
48+
<echo> domain.configs - reads the domain config and any available host controller configs</echo>
4949
<echo> domain.ds - deploys deploys a test bean for data sources</echo>
5050
<echo> domain.interactive - interactive client that allows user to perform various management operations</echo>
5151
<echo> domain.messaging - deploys HornetQ native sender and receiver</echo>
5252
<echo> domain.rar - deploys deploys a resource adapter</echo>
53-
<echo> domain.servers - shows domain, server manager and server configs, starts/stops servers</echo>
53+
<echo> domain.servers - shows domain, host controller and server configs, starts/stops servers</echo>
5454
</target>
5555

5656
<target name="run" if="example">

Diff for: ‎demos/src/main/java/org/jboss/as/demos/domain/configs/runner/ExampleRunner.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import org.jboss.staxmapper.XMLMapper;
3939

4040
/**
41-
* Demonstration of basic aspects of reading domain and server manager configurations
41+
* Demonstration of basic aspects of reading domain and host controller configurations
4242
* via the domain management API.
4343
*
4444
* @author Brian Stansberry
@@ -52,15 +52,15 @@ public static void main(String[] args) throws Exception {
5252

5353
System.out.println("\nReading the domain configuration:\n");
5454
System.out.println(writeModel("domain", client.getDomainModel()));
55-
System.out.println("\nReading the list of active server managers:\n");
56-
List<String> serverManagers = client.getServerManagerNames();
57-
for (String sm : serverManagers) {
58-
System.out.println(sm);
55+
System.out.println("\nReading the list of active host controllers:\n");
56+
List<String> hostControllers = client.getHostControllerNames();
57+
for (String hc : hostControllers) {
58+
System.out.println(hc);
5959
}
6060

61-
for (String sm : serverManagers) {
62-
System.out.println("\nReading host configuration for server manager " + sm + "\n");
63-
System.out.println(writeModel("host", client.getHostModel(sm)));
61+
for (String hc : hostControllers) {
62+
System.out.println("\nReading host configuration for host controller " + hc + "\n");
63+
System.out.println(writeModel("host", client.getHostModel(hc)));
6464
}
6565

6666
} finally {

0 commit comments

Comments
 (0)