Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ISPN-9983 Rename infinispan-server-server artifact to infinispan-serv… #6699

Merged
merged 1 commit into from
Feb 25, 2019
Merged

ISPN-9983 Rename infinispan-server-server artifact to infinispan-serv… #6699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
<module>server/hotrod</module>
<module>server/rest</module>
<module>server/router</module>
<module>server/server</module>
<module>server/runtime</module>
<module>client/hotrod-client</module>
<module>atomic-factory</module>
<module>all</module>
Expand Down
0 server/server/README.md → server/runtime/README.md
View file
Open in desktop
File renamed without changes.
0 server/server/build.xml → server/runtime/build.xml
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions server/server/pom.xml → server/runtime/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>infinispan-server-server</artifactId>
<artifactId>infinispan-server-runtime</artifactId>
<packaging>jar</packaging>
<name>Infinispan Server</name>
<description>Infinispan Server</description>
Expand Down Expand Up @@ -126,7 +126,7 @@
<archive>
<manifest>
<addClasspath>true</addClasspath>
<mainClass>org.infinispan.server.server.Bootstrap</mainClass>
<mainClass>org.infinispan.server.Bootstrap</mainClass>
</manifest>
</archive>
</configuration>
Expand Down
11 changes: 5 additions & 6 deletions ...g/infinispan/server/server/Bootstrap.java → ...java/org/infinispan/server/Bootstrap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
package org.infinispan.server.server;

import static org.infinispan.server.server.logging.Messages.MSG;
package org.infinispan.server;

import java.io.File;
import java.io.FileInputStream;
Expand All @@ -11,6 +9,7 @@
import java.util.logging.LogManager;

import org.infinispan.Version;
import org.infinispan.server.logging.Messages;

/**
* @author Tristan Tarrant &lt;tristan@infinispan.org&gt;
Expand Down Expand Up @@ -50,11 +49,11 @@ public static void main(String args[], PrintStream stdOut, PrintStream stdErr, E
}
} else if (command.startsWith("-")) {
if (command.length() != 2) {
stdErr.println(MSG.invalidShortArgument(command));
stdErr.println(Messages.MSG.invalidShortArgument(command));
exitHandler.exit(1);
}
} else {
stdErr.println(MSG.invalidArgument(command));
stdErr.println(Messages.MSG.invalidArgument(command));
exitHandler.exit(1);
}
switch (command) {
Expand Down Expand Up @@ -93,7 +92,7 @@ public static void main(String args[], PrintStream stdOut, PrintStream stdErr, E
exitHandler.exit(0);
break;
default:
stdErr.println(MSG.unknownParameter(args[i]));
stdErr.println(Messages.MSG.unknownParameter(args[i]));
exitHandler.exit(1);
break;
}
Expand Down
2 changes: 1 addition & 1 deletion ...pan/server/server/DefaultExitHandler.java → ...infinispan/server/DefaultExitHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.infinispan.server.server;
package org.infinispan.server;

import org.infinispan.Version;

Expand Down
2 changes: 1 addition & 1 deletion ...infinispan/server/server/ExitHandler.java → ...va/org/infinispan/server/ExitHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.infinispan.server.server;
package org.infinispan.server;

import java.util.concurrent.CompletableFuture;

Expand Down
2 changes: 1 addition & 1 deletion ...nispan/server/server/SecurityActions.java → ...rg/infinispan/server/SecurityActions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.infinispan.server.server;
package org.infinispan.server;

import java.security.AccessController;
import java.security.PrivilegedAction;
Expand Down
6 changes: 3 additions & 3 deletions .../org/infinispan/server/server/Server.java → ...in/java/org/infinispan/server/Server.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.infinispan.server.server;
package org.infinispan.server;

import java.io.File;
import java.io.FileInputStream;
Expand All @@ -24,10 +24,10 @@
import org.infinispan.configuration.parsing.ParserRegistry;
import org.infinispan.lifecycle.ComponentStatus;
import org.infinispan.manager.DefaultCacheManager;
import org.infinispan.server.configuration.ServerConfiguration;
import org.infinispan.server.core.ProtocolServer;
import org.infinispan.server.core.configuration.ProtocolServerConfiguration;
import org.infinispan.server.server.configuration.ServerConfiguration;
import org.infinispan.server.server.logging.Log;
import org.infinispan.server.logging.Log;
import org.infinispan.util.logging.LogFactory;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...nfinispan/server/server/ShutdownHook.java → ...a/org/infinispan/server/ShutdownHook.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.infinispan.server.server;
package org.infinispan.server;

/**
* @author Tristan Tarrant
Expand Down
2 changes: 1 addition & 1 deletion ...erver/server/configuration/Attribute.java → ...ispan/server/configuration/Attribute.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.infinispan.server.server.configuration;
package org.infinispan.server.configuration;

import java.util.HashMap;
import java.util.Map;
Expand Down
2 changes: 1 addition & 1 deletion .../server/server/configuration/Element.java → ...inispan/server/configuration/Element.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.infinispan.server.server.configuration;
package org.infinispan.server.configuration;

import java.util.HashMap;
import java.util.Map;
Expand Down
8 changes: 4 additions & 4 deletions ...er/configuration/ServerConfiguration.java → ...er/configuration/ServerConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package org.infinispan.server.server.configuration;
package org.infinispan.server.configuration;

import java.util.Collections;
import java.util.List;
import java.util.Map;

import org.infinispan.commons.configuration.BuiltBy;
import org.infinispan.server.core.configuration.ProtocolServerConfiguration;
import org.infinispan.server.server.network.NetworkAddress;
import org.infinispan.server.server.network.SocketBinding;
import org.infinispan.server.server.security.ServerSecurityRealm;
import org.infinispan.server.network.NetworkAddress;
import org.infinispan.server.network.SocketBinding;
import org.infinispan.server.security.ServerSecurityRealm;

/**
* @author Tristan Tarrant &lt;tristan@infinispan.org&gt;
Expand Down
10 changes: 5 additions & 5 deletions ...iguration/ServerConfigurationBuilder.java → ...iguration/ServerConfigurationBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.infinispan.server.server.configuration;
package org.infinispan.server.configuration;

import java.util.ArrayList;
import java.util.HashMap;
Expand All @@ -9,10 +9,10 @@
import org.infinispan.commons.configuration.Builder;
import org.infinispan.configuration.global.GlobalConfigurationBuilder;
import org.infinispan.server.core.configuration.ProtocolServerConfigurationBuilder;
import org.infinispan.server.server.Server;
import org.infinispan.server.server.network.NetworkAddress;
import org.infinispan.server.server.network.SocketBinding;
import org.infinispan.server.server.security.ServerSecurityRealm;
import org.infinispan.server.Server;
import org.infinispan.server.network.NetworkAddress;
import org.infinispan.server.network.SocketBinding;
import org.infinispan.server.security.ServerSecurityRealm;

/**
* @author Tristan Tarrant
Expand Down
6 changes: 3 additions & 3 deletions ...figuration/ServerConfigurationParser.java → ...figuration/ServerConfigurationParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.infinispan.server.server.configuration;
package org.infinispan.server.configuration;

import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;

Expand All @@ -19,8 +19,8 @@
import org.infinispan.configuration.parsing.ParseUtils;
import org.infinispan.configuration.parsing.ParserScope;
import org.infinispan.configuration.parsing.XMLExtendedStreamReader;
import org.infinispan.server.server.network.NetworkAddress;
import org.infinispan.server.server.security.PropertiesSecurityRealm;
import org.infinispan.server.network.NetworkAddress;
import org.infinispan.server.security.PropertiesSecurityRealm;
import org.kohsuke.MetaInfServices;
import org.wildfly.security.auth.server.SecurityRealm;

Expand Down
2 changes: 1 addition & 1 deletion ...erver/configuration/hotrod/Attribute.java → ...erver/configuration/hotrod/Attribute.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.infinispan.server.server.configuration.hotrod;
package org.infinispan.server.configuration.hotrod;

import java.util.HashMap;
import java.util.Map;
Expand Down
2 changes: 1 addition & 1 deletion .../server/configuration/hotrod/Element.java → .../server/configuration/hotrod/Element.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.infinispan.server.server.configuration.hotrod;
package org.infinispan.server.configuration.hotrod;

import java.util.HashMap;
import java.util.Map;
Expand Down
6 changes: 3 additions & 3 deletions ...trod/HotRodServerConfigurationParser.java → ...trod/HotRodServerConfigurationParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.infinispan.server.server.configuration.hotrod;
package org.infinispan.server.configuration.hotrod;

import javax.security.sasl.Sasl;
import javax.xml.stream.XMLStreamConstants;
Expand All @@ -14,8 +14,8 @@
import org.infinispan.server.core.configuration.SslConfigurationBuilder;
import org.infinispan.server.hotrod.configuration.AuthenticationConfigurationBuilder;
import org.infinispan.server.hotrod.configuration.HotRodServerConfigurationBuilder;
import org.infinispan.server.server.configuration.ServerConfigurationBuilder;
import org.infinispan.server.server.configuration.ServerConfigurationParser;
import org.infinispan.server.configuration.ServerConfigurationBuilder;
import org.infinispan.server.configuration.ServerConfigurationParser;
import org.kohsuke.MetaInfServices;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...er/configuration/memcached/Attribute.java → ...er/configuration/memcached/Attribute.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.infinispan.server.server.configuration.memcached;
package org.infinispan.server.configuration.memcached;

import java.util.HashMap;
import java.util.Map;
Expand Down
2 changes: 1 addition & 1 deletion ...rver/configuration/memcached/Element.java → ...rver/configuration/memcached/Element.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.infinispan.server.server.configuration.memcached;
package org.infinispan.server.configuration.memcached;

import java.util.HashMap;
import java.util.Map;
Expand Down
6 changes: 3 additions & 3 deletions ...d/MemcachedServerConfigurationParser.java → ...d/MemcachedServerConfigurationParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.infinispan.server.server.configuration.memcached;
package org.infinispan.server.configuration.memcached;

import javax.xml.stream.XMLStreamException;

Expand All @@ -10,8 +10,8 @@
import org.infinispan.configuration.parsing.ParseUtils;
import org.infinispan.configuration.parsing.XMLExtendedStreamReader;
import org.infinispan.server.memcached.configuration.MemcachedServerConfigurationBuilder;
import org.infinispan.server.server.configuration.ServerConfigurationBuilder;
import org.infinispan.server.server.configuration.ServerConfigurationParser;
import org.infinispan.server.configuration.ServerConfigurationBuilder;
import org.infinispan.server.configuration.ServerConfigurationParser;
import org.kohsuke.MetaInfServices;

/**
Expand Down
2 changes: 1 addition & 1 deletion .../server/configuration/rest/Attribute.java → .../server/configuration/rest/Attribute.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.infinispan.server.server.configuration.rest;
package org.infinispan.server.configuration.rest;

import java.util.HashMap;
import java.util.Map;
Expand Down
2 changes: 1 addition & 1 deletion ...er/server/configuration/rest/Element.java → ...an/server/configuration/rest/Element.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.infinispan.server.server.configuration.rest;
package org.infinispan.server.configuration.rest;

import java.util.HashMap;
import java.util.Map;
Expand Down
10 changes: 5 additions & 5 deletions ...n/rest/RestServerConfigurationParser.java → ...n/rest/RestServerConfigurationParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.infinispan.server.server.configuration.rest;
package org.infinispan.server.configuration.rest;

import static org.infinispan.commons.util.StringPropertyReplacer.replaceProperties;

Expand All @@ -17,10 +17,10 @@
import org.infinispan.configuration.parsing.XMLExtendedStreamReader;
import org.infinispan.rest.configuration.ExtendedHeaders;
import org.infinispan.rest.configuration.RestServerConfigurationBuilder;
import org.infinispan.server.server.Server;
import org.infinispan.server.server.configuration.ServerConfigurationBuilder;
import org.infinispan.server.server.configuration.ServerConfigurationParser;
import org.infinispan.server.server.network.SocketBinding;
import org.infinispan.server.Server;
import org.infinispan.server.configuration.ServerConfigurationBuilder;
import org.infinispan.server.configuration.ServerConfigurationParser;
import org.infinispan.server.network.SocketBinding;
import org.infinispan.util.logging.LogFactory;
import org.kohsuke.MetaInfServices;

Expand Down
2 changes: 1 addition & 1 deletion ...nispan/server/server/filesystem/Path.java → ...rg/infinispan/server/filesystem/Path.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.infinispan.server.server.filesystem;
package org.infinispan.server.filesystem;

import java.io.File;

Expand Down
2 changes: 1 addition & 1 deletion ...infinispan/server/server/logging/Log.java → ...va/org/infinispan/server/logging/Log.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.infinispan.server.server.logging;
package org.infinispan.server.logging;

import org.infinispan.commons.CacheConfigurationException;
import org.jboss.logging.BasicLogger;
Expand Down
2 changes: 1 addition & 1 deletion ...ispan/server/server/logging/Messages.java → ...g/infinispan/server/logging/Messages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.infinispan.server.server.logging;
package org.infinispan.server.logging;

import org.jboss.logging.annotations.Message;
import org.jboss.logging.annotations.MessageBundle;
Expand Down
4 changes: 2 additions & 2 deletions ...server/server/network/NetworkAddress.java → ...nispan/server/network/NetworkAddress.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.infinispan.server.server.network;
package org.infinispan.server.network;

import java.net.InetAddress;
import java.net.NetworkInterface;
Expand All @@ -8,7 +8,7 @@
import java.util.function.Predicate;

import org.infinispan.commons.CacheConfigurationException;
import org.infinispan.server.server.Server;
import org.infinispan.server.Server;

/**
* @author Tristan Tarrant &lt;tristan@infinispan.org&gt;
Expand Down
2 changes: 1 addition & 1 deletion .../server/server/network/SocketBinding.java → ...inispan/server/network/SocketBinding.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.infinispan.server.server.network;
package org.infinispan.server.network;

/**
* @author Tristan Tarrant &lt;tristan@infinispan.org&gt;
Expand Down
2 changes: 1 addition & 1 deletion ...erver/security/KerberosSecurityRealm.java → ...erver/security/KerberosSecurityRealm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.infinispan.server.server.security;
package org.infinispan.server.security;

import java.io.File;
import java.security.spec.AlgorithmParameterSpec;
Expand Down
2 changes: 1 addition & 1 deletion ...ver/security/PropertiesSecurityRealm.java → ...ver/security/PropertiesSecurityRealm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.infinispan.server.server.security;
package org.infinispan.server.security;

import java.io.File;
import java.io.FileInputStream;
Expand Down
2 changes: 1 addition & 1 deletion .../server/security/ServerSecurityRealm.java → .../server/security/ServerSecurityRealm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.infinispan.server.server.security;
package org.infinispan.server.security;

import javax.net.ssl.SSLContext;

Expand Down
0 ...rc/main/resources/infinispan-defaults.xml → ...rc/main/resources/infinispan-defaults.xml
View file
Open in desktop
File renamed without changes.
0 ...sources/schema/infinispan-server-10.0.xsd → ...sources/schema/infinispan-server-10.0.xsd
View file
Open in desktop
File renamed without changes.
0 ...er/server/src/main/server/bin/server.conf → ...r/runtime/src/main/server/bin/server.conf
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion server/server/src/main/server/bin/server.sh → server/runtime/src/main/server/bin/server.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ if [ "x$ISPN_CONFIG_DIR" = "x" ]; then
ISPN_CONFIG_DIR="$ISPN_BASE_DIR/conf"
fi
# get the bootstrap jar
BOOTSTRAP_JAR="$ISPN_HOME/lib/infinispan-server-server-*.jar"
BOOTSTRAP_JAR="$ISPN_HOME/lib/infinispan-server-runtime-*.jar"

# For Cygwin, switch paths to Windows format before running java
if $cygwin; then
Expand Down
0 .../server/conf/application-roles.properties → .../server/conf/application-roles.properties
View file
Open in desktop
File renamed without changes.
0 .../server/conf/application-users.properties → .../server/conf/application-users.properties
View file
Open in desktop
File renamed without changes.
0 ...rc/main/server/server/conf/infinispan.xml → ...rc/main/server/server/conf/infinispan.xml
View file
Open in desktop
File renamed without changes.
0 ...ain/server/server/conf/logging.properties → ...ain/server/server/conf/logging.properties
View file
Open in desktop
File renamed without changes.
0 ...server/server/conf/mgmt-groups.properties → ...server/server/conf/mgmt-groups.properties
View file
Open in desktop
File renamed without changes.
0 .../server/server/conf/mgmt-users.properties → .../server/server/conf/mgmt-users.properties
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions ...an/server/server/ClusteredServerTest.java → ...nfinispan/server/ClusteredServerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package org.infinispan.server.server;
package org.infinispan.server;

import static org.junit.Assert.assertEquals;

import org.infinispan.client.hotrod.RemoteCache;
import org.infinispan.client.hotrod.RemoteCacheManager;
import org.infinispan.server.server.test.ServerTestMethodConfiguration;
import org.infinispan.server.server.test.ServerTestMethodRule;
import org.infinispan.server.server.test.ServerTestConfiguration;
import org.infinispan.server.server.test.ServerTestRule;
import org.infinispan.server.test.ServerTestMethodConfiguration;
import org.infinispan.server.test.ServerTestMethodRule;
import org.infinispan.server.test.ServerTestConfiguration;
import org.infinispan.server.test.ServerTestRule;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
Expand Down
2 changes: 1 addition & 1 deletion .../infinispan/server/server/RestClient.java → ...ava/org/infinispan/server/RestClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.infinispan.server.server;
package org.infinispan.server;

import java.io.IOException;

Expand Down
13 changes: 7 additions & 6 deletions ...server/ServerConfigurationParserTest.java → ...server/ServerConfigurationParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.infinispan.server.server;
package org.infinispan.server;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
Expand All @@ -13,10 +13,11 @@
import org.infinispan.configuration.parsing.ConfigurationBuilderHolder;
import org.infinispan.configuration.parsing.ParserRegistry;
import org.infinispan.rest.configuration.RestServerConfiguration;
import org.infinispan.server.configuration.ServerConfiguration;
import org.infinispan.server.hotrod.configuration.HotRodServerConfiguration;
import org.infinispan.server.memcached.configuration.MemcachedServerConfiguration;
import org.infinispan.server.server.configuration.ServerConfiguration;
import org.infinispan.server.server.network.NetworkAddress;
import org.infinispan.server.network.NetworkAddress;
import org.junit.Assert;
import org.junit.Test;

/**
Expand Down Expand Up @@ -47,9 +48,9 @@ public void testParser() throws IOException {

// Socket bindings
assertEquals(4, server.socketBindings().size());
assertEquals(11222, server.socketBindings().get("hotrod").getPort());
assertEquals(11221, server.socketBindings().get("memcached").getPort());
assertEquals(8080, server.socketBindings().get("rest").getPort());
Assert.assertEquals(11222, server.socketBindings().get("hotrod").getPort());
Assert.assertEquals(11221, server.socketBindings().get("memcached").getPort());
Assert.assertEquals(8080, server.socketBindings().get("rest").getPort());

// Endpoints
assertEquals(3, server.endpoints().size());
Expand Down
2 changes: 1 addition & 1 deletion .../server/test/ServerTestConfiguration.java → .../server/test/ServerTestConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.infinispan.server.server.test;
package org.infinispan.server.test;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Expand Down