Skip to content
Permalink
Browse files
Implemented XjbInitialContextFactory from XJB, Slight usage error
Another Guice Persist Update, JNDI Context related classes added to
assist in the binding process.
  • Loading branch information
jadenmitchell committed Jun 18, 2016
1 parent 69b98ee commit 92aebc9
Show file tree
Hide file tree
Showing 12 changed files with 796 additions and 278 deletions.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

@@ -11,6 +11,7 @@
import org.mdev.revolution.communication.encryption.HabboEncryption;
import org.mdev.revolution.communication.packets.PacketManager;
import org.mdev.revolution.database.DatabaseManager;
import org.mdev.revolution.database.domain.Player;
import org.mdev.revolution.game.players.PlayerService;
import org.mdev.revolution.network.Server;
import org.mdev.revolution.network.sessions.SessionManager;
@@ -141,7 +142,7 @@ public static void main(String[] args) {
Thread hook = new Thread(Revolution::shutdown);
Runtime.getRuntime().addShutdownHook(hook);

PlayerService.findPlayer("");
PlayerService.getInstance().findPlayer("542abedcbca62eb7d0220b32a5b88689");

while (true) {}
}
@@ -12,15 +12,16 @@
import org.hibernate.resource.transaction.backend.jta.internal.JtaTransactionCoordinatorBuilderImpl;
import org.hibernate.service.ServiceRegistry;
import org.mdev.revolution.Revolution;
import org.mdev.revolution.communication.packets.outgoing.notifications.HabboBroadcastMessageComposer;
import org.mdev.revolution.utilities.jndi.XjbInitialContextFactory;
import org.mdev.revolution.utilities.jndi.XjbInitialContextFactoryBuilder;

import javax.inject.Inject;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.naming.spi.InitialContextFactoryBuilder;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Hashtable;

public class DatabaseManager {
private static final Logger logger = LogManager.getLogger(DatabaseManager.class);
@@ -41,30 +42,32 @@ public void initialize() {
hikariConfig.addDataSourceProperty("prepStmtCacheSize", 250);
hikariConfig.addDataSourceProperty("prepStmtCacheSqlLimit", 2048);
dataSource = new HikariDataSource(hikariConfig);
try {
Hashtable<Object, Object> env = new Hashtable<>();
env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.fscontext.RefFSContextFactory");
env.put(Context.PROVIDER_URL, "corbaloc::localhost:9810,:localhost:9811");
Context context = new InitialContext(env);
context.bind("java:/comp/env/jdbc/default", dataSource);
}
catch(NamingException e) {
logger.error("Error binding the JNDI DataSource to the Context", e);
System.exit(0);
}
setupInitialContext();
Configuration configuration = new Configuration().configure();
ServiceRegistry serviceRegistry
= new StandardServiceRegistryBuilder()
//.applySetting(Environment.CONNECTION_PROVIDER, "com.zaxxer.hikari.hibernate.HikariConnectionProvider")
//.applySetting(Environment.SESSION_FACTORY_NAME, dataSource.getDataSourceJNDI())
//.applySetting(Environment.SESSION_FACTORY_NAME_IS_JNDI, "true")
.applySetting(Environment.SESSION_FACTORY_NAME, dataSource.getDataSourceJNDI())
.applySetting(Environment.SESSION_FACTORY_NAME_IS_JNDI, "true")
.applySetting(Environment.TRANSACTION_COORDINATOR_STRATEGY, JtaTransactionCoordinatorBuilderImpl.class)
.applySetting(Environment.DIALECT, "org.hibernate.dialect." + (Revolution.getConfig().getString("mysql.dialect").equals("innodb") ? "MySQLInnoDBDialect" : "MySQLDialect"))
.applySetting(Environment.DATASOURCE, dataSource)
.build();
sessionFactory = configuration.buildSessionFactory(serviceRegistry);
}

private void setupInitialContext() {
//"jdbc/default
try {
XjbInitialContextFactory xjbInitialContextFactory = new XjbInitialContextFactory();
xjbInitialContextFactory.register("jdbc/default", dataSource);
}
catch(NamingException e) {
logger.error("Error while binding the Hikari DataSource to the JNDI Context", e);
System.exit(0); // fatal error
}
}

public Session openSession() {
return sessionFactory.openSession();
}
@@ -4,16 +4,17 @@
import com.google.inject.Singleton;
import com.google.inject.persist.PersistService;
import com.google.inject.persist.jpa.JpaPersistModule;
import org.mdev.revolution.database.dao.GenericJpaDao;
import org.mdev.revolution.database.dao.PlayerDao;

import javax.inject.Inject;

public class DatabaseModule extends AbstractModule {
public static final DatabaseModule INSTANCE = new DatabaseModule();

@Override
protected void configure() {
install(new JpaPersistModule("org.mdev.revolution.jpa"));
bind(JPAInitializer.class).asEagerSingleton();
bind(GenericJpaDao.class).to(PlayerDao.class);
}

@Singleton
@@ -21,6 +21,7 @@

@SuppressWarnings("unchecked")
public abstract class GenericJpaDao<T, K extends Serializable> {
@Inject
@PersistenceContext
private EntityManager entityManager;

@@ -30,12 +31,6 @@ public void setClazz(Class clazz) {
this.clazz = clazz;
}

@Inject
public GenericJpaDao() {
Injector injector = Guice.createInjector(DatabaseModule.INSTANCE);
entityManager = injector.getInstance(EntityManager.class);
}

@Transactional
public void create(T entity) {
entityManager.persist(entity);
@@ -18,7 +18,7 @@ public PlayerBean(Player player) {

public void cleanup() {
if (player != null) {
PlayerService.save(player);
PlayerService.getInstance().save(player);
player = null;
}
}
@@ -1,31 +1,49 @@
package org.mdev.revolution.game.players;

import com.google.inject.Guice;
import com.google.inject.Injector;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.mdev.revolution.Revolution;
import org.mdev.revolution.communication.packets.incoming.handshake.SSOTicketMessageEvent;
import org.mdev.revolution.database.DatabaseModule;
import org.mdev.revolution.database.dao.PlayerDao;
import org.mdev.revolution.database.domain.Player;

import javax.inject.Inject;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;

public final class PlayerService {
public class PlayerService {
private static final Logger logger = LogManager.getLogger(PlayerService.class);

private static final PlayerDao playerDao = new PlayerDao();
private static final PlayerService INSTANCE = new PlayerService();

public static PlayerService getInstance() {
return PlayerService.INSTANCE;
}

@Inject
private PlayerDao playerDao;

@SuppressWarnings("unchecked")
public static PlayerDao getPlayerDao() {
public PlayerDao getPlayerDao() {
return playerDao;
}

public static void save(Player player) {
public PlayerService() {
Injector injector = Guice.createInjector(new DatabaseModule());
injector.injectMembers(this);
}

@SuppressWarnings("unchecked")
public void save(Player player) {
playerDao.save(player);
}

public static Player findPlayer(String ssoTicket) {
public Player findPlayer(String ssoTicket) {
if (ssoTicket.contains(SSOTicketMessageEvent.TICKET_DELIMITER)) {
ssoTicket = ssoTicket.split(SSOTicketMessageEvent.TICKET_DELIMITER)[1];

@@ -43,7 +43,7 @@ public boolean tryLogin(String ssoTicket) {
try {
logger.info("logging in...");
//ssoTicket = ESAPI.encoder().encodeForSQL(new OracleCodec(), ssoTicket);
Player player = PlayerService.findPlayer(ssoTicket);
Player player = PlayerService.getInstance().findPlayer(ssoTicket);
if (player == null) {
sendPacket(new HabboBroadcastMessageComposer("No player found with your session ticket"));
return false;
@@ -0,0 +1,23 @@
/*
* Created on 19-Mar-2004
*
* (c) 2003-2004 ThoughtWorks Ltd
*
* See license.txt for license details
*/
package org.mdev.revolution.utilities.jndi;

/**
* @author <a href="mailto:dan.north@thoughtworks.com">Dan North</a>
*/
public interface JndiRegistry {
/**
* Register an object against a particular JNDI name in global context
*/
void register(String jndiName, Object object);

/**
* Register an object against a particular JNDI name in local context
*/
void register(String localContextName, String jndiName, Object object);
}
@@ -0,0 +1,155 @@
/*
* Created on 02-Feb-2004
*
* (c) 2003-2004 ThoughtWorks
*
* See license.txt for licence details
*/
package org.mdev.revolution.utilities.jndi;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.util.HashMap;
import java.util.Hashtable;
import java.util.Map;

import javax.naming.Context;
import javax.naming.NamingException;
import javax.naming.spi.InitialContextFactory;
import javax.naming.spi.NamingManager;

public class XjbInitialContextFactory implements JndiRegistry, InitialContextFactory {
private static final Logger logger = LogManager.getLogger(XjbInitialContextFactory.class);

private static final Map localContexts = new HashMap();
private static final HashMap globalContext = new HashMap(); // we use HashMap.clone()

private static String localContextName;

private static class ContextInvocationHandler implements InvocationHandler {
private static final String JAVA_COMP_ENV = "java:comp/env";

private final Map global;
private final Map local;

public ContextInvocationHandler(HashMap global, HashMap local) {
this.global = (Map)global.clone();
this.local = (Map)local.clone();
}

public Object invoke(Object proxy, Method method, Object[] args)
throws Throwable {
if ("lookup".equals(method.getName())) {
final String jndiName = (String) args[0];
return lookup(jndiName, proxy);
}
throw new UnsupportedOperationException("invoke");
}

private Object lookup(String jndiName, Object proxy) throws NamingException {
// special case
if (JAVA_COMP_ENV.equals(jndiName)) {
logger.debug("Returning self as java:comp/env subcontext");
return proxy;
}
jndiName = XjbInitialContextFactory.fullyQualified(jndiName);
Object result = local.get(jndiName);
if (result == null) {
result = global.get(jndiName);
}
if (result == null) {
throw new NamingException("Unable to lookup " + jndiName);
}
return result;
}
}

/**
* Install this class as the system-wide initial context factory.
*
* @see NamingManager#setInitialContextFactoryBuilder(javax.naming.spi.InitialContextFactoryBuilder)
*/
public XjbInitialContextFactory() throws NamingException {
if (!NamingManager.hasInitialContextFactoryBuilder()) {
NamingManager.setInitialContextFactoryBuilder(new XjbInitialContextFactoryBuilder());
}
}

/**
* Reset the registry to its initial state
*
* You can only install a factory builder once, so to reset the JNDI registry
* you need to {@link #clear()} it down.
*/
public static void clear() {
globalContext.clear();
localContexts.clear();
localContextName = null;
}

/**
* Push a new local JNDI context for future initial context lookups
*
* @see #getInitialContext(Hashtable)
*/
public static void setLocalContext(String contextName) {
localContextName = contextName;
}

/**
* Get the name of the current local context
*/
public static String getLocalContextName() {
return localContextName;
}

/**
* Provide an <tt>InitialContextFactory</tt> to use to navigate a JNDI
* tree.
*
* @return a dynamic {@link Proxy} representing the <tt>Context</tt>
*/
public Context getInitialContext(Hashtable environment) throws NamingException {
logger.debug("Getting initial context - current local context = " + localContextName);
return (Context) Proxy.newProxyInstance(
Context.class.getClassLoader(),
new Class[]{Context.class},
new ContextInvocationHandler(globalContext, getLocalContext(localContextName)));
}

/**
* Register an object against a particular JNDI name in global context
*/
public void register(String jndiName, Object object) {
globalContext.put(fullyQualified(jndiName), object);
}

/**
* Register an object against a particular JNDI name in local context
*/
public void register(String contextName, String jndiName, Object object) {
getLocalContext(contextName).put(fullyQualified(jndiName), object);
}

private static HashMap getLocalContext(String contextName) {
HashMap localContext = (HashMap) localContexts.get(contextName);
if (localContext == null) {
localContext = new HashMap();
localContexts.put(contextName, localContext);
}
return localContext;
}

private static String fullyQualified(String jndiName) {
if (jndiName.startsWith("java:comp/env/")) {
return jndiName;
}
else {
return "java:comp/env/" + jndiName;
}
}
}

0 comments on commit 92aebc9

Please sign in to comment.