Skip to content

Commit

Permalink
ISPN-9983 Rename infinispan-server-server artifact to infinispan-serv…
Browse files Browse the repository at this point in the history
…er-runtime
  • Loading branch information
ryanemerson authored and tristantarrant committed Feb 25, 2019
1 parent 50942fa commit 6306a1d
Show file tree
Hide file tree
Showing 53 changed files with 76 additions and 76 deletions.
2 changes: 1 addition & 1 deletion pom.xml
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
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions server/server/pom.xml → server/runtime/pom.xml
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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

0 comments on commit 6306a1d

Please sign in to comment.