Author: dblevins
Date: Mon Sep 5 01:26:40 2011
New Revision: 1165141
URL: http://svn.apache.org/viewvc?rev=1165141&view=rev
Log:
Reformatted
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AppValidator.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckDescriptorLocation.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Exceptions.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/StringUtilities.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/CheckDescriptorLocationTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/CheckDescriptorLocationTestFileDeletionHelper.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/util/Archives.java
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java?rev=1165141&r1=1165140&r2=1165141&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java
Mon Sep 5 01:26:40 2011
@@ -16,7 +16,6 @@
*/
package org.apache.openejb;
-import javax.validation.ValidationException;
import org.apache.openejb.assembler.classic.AppInfo;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.cdi.OWBInjector;
@@ -47,7 +46,6 @@ import org.apache.openejb.util.LogCatego
import org.apache.openejb.util.Logger;
import org.apache.openejb.util.OptionsLog;
import org.apache.openejb.util.ServiceManagerProxy;
-import org.apache.openejb.util.StringUtilities;
import org.apache.xbean.naming.context.ContextFlyweight;
import javax.ejb.EJBException;
@@ -57,6 +55,7 @@ import javax.naming.Context;
import javax.naming.Name;
import javax.naming.NameNotFoundException;
import javax.naming.NamingException;
+import javax.validation.ValidationException;
import java.io.File;
import java.lang.reflect.Modifier;
import java.net.MalformedURLException;
@@ -233,7 +232,7 @@ public class OpenEjbContainer extends EJ
for (String caller : callers) {
if (!isValid(caller)) continue;
-
+
final ManagedBean bean = ejbJar.addEnterpriseBean(new
ManagedBean(caller, caller));
// set it to bean so it can get UserTransaction injection
@@ -341,7 +340,7 @@ public class OpenEjbContainer extends EJ
if (modules instanceof String) {
moduleLocations =
configurationFactory.getModulesFromClassPath(null, classLoader);
- for (Iterator<File> i = moduleLocations.iterator();
i.hasNext();) {
+ for (Iterator<File> i = moduleLocations.iterator();
i.hasNext(); ) {
File file = i.next();
if (!match((String) modules, file)) {
i.remove();
@@ -355,7 +354,7 @@ public class OpenEjbContainer extends EJ
int matched = 0;
- for (Iterator<File> i = moduleLocations.iterator();
i.hasNext();) {
+ for (Iterator<File> i = moduleLocations.iterator();
i.hasNext(); ) {
File file = i.next();
boolean remove = true;
for (String s : (String[]) modules) {
@@ -408,7 +407,7 @@ public class OpenEjbContainer extends EJ
if (moduleLocations.isEmpty()) {
- throw Exceptions.newNoModulesFoundException();
+ throw Exceptions.newNoModulesFoundException();
}
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AppValidator.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AppValidator.java?rev=1165141&r1=1165140&r2=1165141&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AppValidator.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AppValidator.java
Mon Sep 5 01:26:40 2011
@@ -16,10 +16,6 @@
*/
package org.apache.openejb.config;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.HelpFormatter;
@@ -30,10 +26,23 @@ import org.apache.commons.cli.ParseExcep
import org.apache.commons.cli.PosixParser;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.cli.SystemExitException;
-import org.apache.openejb.config.rules.*;
+import org.apache.openejb.config.rules.CheckAssemblyBindings;
+import org.apache.openejb.config.rules.CheckAsynchronous;
+import org.apache.openejb.config.rules.CheckCallbacks;
+import org.apache.openejb.config.rules.CheckClasses;
+import org.apache.openejb.config.rules.CheckDependsOn;
+import org.apache.openejb.config.rules.CheckDescriptorLocation;
+import org.apache.openejb.config.rules.CheckInjectionTargets;
+import org.apache.openejb.config.rules.CheckMethods;
+import org.apache.openejb.config.rules.CheckPersistenceRefs;
+import org.apache.openejb.config.rules.CheckUserTransactionRefs;
import org.apache.openejb.util.Messages;
import org.apache.openejb.util.OpenEjbVersion;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* @version $Rev$ $Date$
*/
@@ -69,7 +78,8 @@ public class AppValidator {
ValidationResults[] ejbSets = new ValidationResults[sets.size()];
return sets.toArray(ejbSets);
}
-// START SNIPPET : code2
+
+ // START SNIPPET : code2
public AppModule validate(final AppModule appModule) {
try {
ValidationRule[] rules = getValidationRules();
@@ -85,7 +95,8 @@ public class AppValidator {
}
return appModule;
}
-// END SNIPPET : code2
+
+ // END SNIPPET : code2
// START SNIPPET : code1
protected ValidationRule[] getValidationRules() {
ValidationRule[] rules = new ValidationRule[]{
@@ -102,7 +113,8 @@ public class AppValidator {
};
return rules;
}
-// END SNIPPET : code1
+
+ // END SNIPPET : code1
public void printResults(ValidationResults set) {
if (!set.hasErrors() && !set.hasFailures() && (!PRINT_WARNINGS ||
!set.hasWarnings())) {
return;
@@ -257,7 +269,7 @@ public class AppValidator {
private static void help(Options options) {
HelpFormatter formatter = new HelpFormatter();
- formatter.printHelp("validate [options] <file> [<file>...]", "\n"+
AppValidator.i18n("cmd.validate.description"), options, "\n");
+ formatter.printHelp("validate [options] <file> [<file>...]", "\n" +
AppValidator.i18n("cmd.validate.description"), options, "\n");
}
private static Option option(String shortOpt, String longOpt, String
description) {
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java?rev=1165141&r1=1165140&r2=1165141&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
Mon Sep 5 01:26:40 2011
@@ -18,7 +18,33 @@ package org.apache.openejb.config;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.Vendor;
-import org.apache.openejb.assembler.classic.*;
+import org.apache.openejb.assembler.classic.AppInfo;
+import org.apache.openejb.assembler.classic.Assembler;
+import org.apache.openejb.assembler.classic.BmpEntityContainerInfo;
+import org.apache.openejb.assembler.classic.ClientInfo;
+import org.apache.openejb.assembler.classic.CmpEntityContainerInfo;
+import org.apache.openejb.assembler.classic.ConnectionManagerInfo;
+import org.apache.openejb.assembler.classic.ConnectorInfo;
+import org.apache.openejb.assembler.classic.ContainerInfo;
+import org.apache.openejb.assembler.classic.ContainerSystemInfo;
+import org.apache.openejb.assembler.classic.EjbJarInfo;
+import org.apache.openejb.assembler.classic.FacilitiesInfo;
+import org.apache.openejb.assembler.classic.HandlerChainInfo;
+import org.apache.openejb.assembler.classic.HandlerInfo;
+import org.apache.openejb.assembler.classic.JndiContextInfo;
+import org.apache.openejb.assembler.classic.ManagedContainerInfo;
+import org.apache.openejb.assembler.classic.MdbContainerInfo;
+import org.apache.openejb.assembler.classic.OpenEjbConfiguration;
+import org.apache.openejb.assembler.classic.OpenEjbConfigurationFactory;
+import org.apache.openejb.assembler.classic.ProxyFactoryInfo;
+import org.apache.openejb.assembler.classic.ResourceInfo;
+import org.apache.openejb.assembler.classic.SecurityServiceInfo;
+import org.apache.openejb.assembler.classic.ServiceInfo;
+import org.apache.openejb.assembler.classic.SingletonSessionContainerInfo;
+import org.apache.openejb.assembler.classic.StatefulSessionContainerInfo;
+import org.apache.openejb.assembler.classic.StatelessSessionContainerInfo;
+import org.apache.openejb.assembler.classic.TransactionServiceInfo;
+import org.apache.openejb.assembler.classic.WebAppInfo;
import org.apache.openejb.config.sys.AbstractService;
import org.apache.openejb.config.sys.ConnectionManager;
import org.apache.openejb.config.sys.Container;
@@ -115,20 +141,20 @@ public class ConfigurationFactory implem
chain.add(new GeneratedClientModules.Prune());
chain.add(new ClearEmptyMappedName());
- //START SNIPPET: code
+ //START SNIPPET: code
if (!options.get(VALIDATION_SKIP_PROPERTY, false)) {
chain.add(new ValidateModules());
} else {
DeploymentLoader.logger.info("validationDisabled",
VALIDATION_SKIP_PROPERTY);
}
- //END SNIPPET: code
+ //END SNIPPET: code
chain.add(new InitEjbDeployments());
- if (options.get(DEBUGGABLE_VM_HACKERY_PROPERTY, false)){
+ if (options.get(DEBUGGABLE_VM_HACKERY_PROPERTY, false)) {
chain.add(new DebuggableVmHackery());
}
- if (options.get(WEBSERVICES_ENABLED, true)){
+ if (options.get(WEBSERVICES_ENABLED, true)) {
chain.add(new WsDeployer());
} else {
chain.add(new RemoveWebServices());
@@ -151,7 +177,7 @@ public class ConfigurationFactory implem
chain.add(new WlsConversion());
}
- if (SystemInstance.get().hasProperty("openejb.geronimo")){
+ if (SystemInstance.get().hasProperty("openejb.geronimo")) {
// must be after CmpJpaConversion since it adds new
persistence-context-refs
chain.add(new GeronimoMappedName());
}
@@ -197,7 +223,7 @@ public class ConfigurationFactory implem
this.deployer = deployerChain;
this.sys = configuration;
}
-
+
public static List<HandlerChainInfo> toHandlerChainInfo(HandlerChains
chains) {
List<HandlerChainInfo> handlerChains = new
ArrayList<HandlerChainInfo>();
if (chains == null) return handlerChains;
@@ -270,10 +296,8 @@ public class ConfigurationFactory implem
}
/**
- * Main loop that gets executed when OpenEJB starts up
- * Reads config files and produces the basic "AST"
- * the assembler needs to actually build the contianer system
- *
+ * Main loop that gets executed when OpenEJB starts up Reads config files
and produces the basic "AST" the assembler needs to actually build the
contianer system
+ * <p/>
* This method is called by the Assembler once at startup.
*
* @return
@@ -317,11 +341,10 @@ public class ConfigurationFactory implem
sys.facilities.resources.addAll(resources);
-
// ConnectionManagerInfo service =
configureService(openejb.getConnectionManager(), ConnectionManagerInfo.class);
// sys.facilities.connectionManagers.add(service);
- if (openejb.getProxyFactory() != null){
+ if (openejb.getProxyFactory() != null) {
sys.facilities.intraVmServer =
configureService(openejb.getProxyFactory(), ProxyFactoryInfo.class);
}
@@ -336,19 +359,19 @@ public class ConfigurationFactory implem
for (String pathname : declaredApps) {
try {
try {
- final File jarFile;
- if(pathname.startsWith("file:/")) {
- jarFile = new File(new
URI(pathname));
- } else {
- jarFile = new File(pathname);
- }
-
- AppInfo appInfo =
configureApplication(jarFile);
-
-
sys.containerSystem.applications.add(appInfo);
- } catch (URISyntaxException e) {
- logger.error("Invalid declaredApp URI
'" + pathname + "'", e);
- }
+ final File jarFile;
+ if (pathname.startsWith("file:/")) {
+ jarFile = new File(new URI(pathname));
+ } else {
+ jarFile = new File(pathname);
+ }
+
+ AppInfo appInfo = configureApplication(jarFile);
+
+ sys.containerSystem.applications.add(appInfo);
+ } catch (URISyntaxException e) {
+ logger.error("Invalid declaredApp URI '" + pathname + "'",
e);
+ }
} catch (OpenEJBException alreadyHandled) {
}
}
@@ -377,7 +400,7 @@ public class ConfigurationFactory implem
if (jarFiles.size() == 0) {
- logger.warning("config.noModulesFoundToDeploy");
+ logger.warning("config.noModulesFoundToDeploy");
}
@@ -431,7 +454,7 @@ public class ConfigurationFactory implem
return jarFiles;
}
- private List<String> toString (List<URL> urls) {
+ private List<String> toString(List<URL> urls) {
List<String> toReturn = new ArrayList<String>(urls.size());
for (URL url : urls) {
try {
@@ -480,7 +503,7 @@ public class ConfigurationFactory implem
protected Object toConfigDeclaration(String name, String value) throws
URISyntaxException, OpenEJBException {
// value = value.replaceFirst("(.)#", "$1%23");
- value = value.replaceFirst("(provider=[^#=&]+)#", "$1%23");
+ value = value.replaceFirst("(provider=[^#=&]+)#", "$1%23");
URI uri = new URI(value);
@@ -512,7 +535,7 @@ public class ConfigurationFactory implem
service.setType(map.remove("type"));
service.setProvider(map.remove("provider"));
service.getProperties().putAll(map);
- } else if (object instanceof Deployments){
+ } else if (object instanceof Deployments) {
Deployments deployments = (Deployments) object;
deployments.setDir(map.remove("dir"));
deployments.setJar(map.remove("jar"));
@@ -554,9 +577,10 @@ public class ConfigurationFactory implem
/**
* embedded usage
+ *
* @param classLoader classloader
- * @param id id supplied from embedded properties or null
- * @param jarFiles list of ejb modules
+ * @param id id supplied from embedded properties or null
+ * @param jarFiles list of ejb modules
* @return configured AppInfo
* @throws OpenEJBException on error
*/
@@ -607,15 +631,15 @@ public class ConfigurationFactory implem
for (Map.Entry<String, Object> entry :
module.getAltDDs().entrySet()) {
Object existingValue = altDDs.get(entry.getKey());
- if (existingValue == null){
+ if (existingValue == null) {
altDDs.put(entry.getKey(), entry.getValue());
- } else if (entry.getValue() instanceof Collection){
- if (existingValue instanceof Collection){
+ } else if (entry.getValue() instanceof Collection) {
+ if (existingValue instanceof Collection) {
Collection values = (Collection) existingValue;
values.addAll((Collection) entry.getValue());
}
- } else if (entry.getValue() instanceof Map){
- if (existingValue instanceof Map){
+ } else if (entry.getValue() instanceof Map) {
+ if (existingValue instanceof Map) {
Map values = (Map) existingValue;
values.putAll((Map) entry.getValue());
}
@@ -721,10 +745,10 @@ public class ConfigurationFactory implem
public <T extends ServiceInfo> T configureService(Class<? extends T> type)
throws OpenEJBException {
- return configureService((Service)null, type);
+ return configureService((Service) null, type);
}
- private <T extends ServiceInfo>Service getDefaultService(Class<? extends
T> type) throws OpenEJBException {
+ private <T extends ServiceInfo> Service getDefaultService(Class<? extends
T> type) throws OpenEJBException {
DefaultService defaultService = defaultProviders.get(type);
if (defaultService == null) return null;
@@ -761,7 +785,7 @@ public class ConfigurationFactory implem
if (service == null) {
service = getDefaultService(infoType);
- if (service == null){
+ if (service == null) {
throw new
OpenEJBException(messages.format("configureService.noDefaultService",
infoType.getName()));
}
}
@@ -771,7 +795,7 @@ public class ConfigurationFactory implem
ServiceProvider provider = resolveServiceProvider(service,
infoType);
- if (provider == null){
+ if (provider == null) {
List<ServiceProvider> providers =
ServiceUtils.getServiceProvidersByServiceType(providerType);
StringBuilder sb = new StringBuilder();
// for (ServiceProvider p : providers) {
@@ -815,7 +839,7 @@ public class ConfigurationFactory implem
value = "<hidden>";
}
- logger.debug("["+key + "=" + value+"]");
+ logger.debug("[" + key + "=" + value + "]");
}
for (Map.Entry<Object, Object> entry : overrides.entrySet()) {
@@ -826,7 +850,7 @@ public class ConfigurationFactory implem
value = "<hidden>";
}
- logger.debug("Override [" + key + "=" + value+"]");
+ logger.debug("Override [" + key + "=" + value + "]");
}
}
@@ -878,7 +902,7 @@ public class ConfigurationFactory implem
if (o instanceof String) {
String value = (String) o;
String trimmed = value.trim();
- if (value.length() != trimmed.length()){
+ if (value.length() != trimmed.length()) {
properties.put(entry.getKey(), trimmed);
}
}
@@ -920,7 +944,7 @@ public class ConfigurationFactory implem
return null;
}
- public <T extends ServiceInfo>T configureService(String id, Class<?
extends T> type) throws OpenEJBException {
+ public <T extends ServiceInfo> T configureService(String id, Class<?
extends T> type) throws OpenEJBException {
return configureService(type, id, null, id, null);
}
@@ -933,7 +957,7 @@ public class ConfigurationFactory implem
* 4. If this fails, check the hardcoded defaults for a default
providerId using the supplied 'type'
* 5. If this fails, throw NoSuchProviderException
*/
- public <T extends ServiceInfo>T configureService(Class<? extends T> type,
String serviceId, Properties declaredProperties, String providerId, String
serviceType) throws OpenEJBException {
+ public <T extends ServiceInfo> T configureService(Class<? extends T> type,
String serviceId, Properties declaredProperties, String providerId, String
serviceType) throws OpenEJBException {
if (type == null) throw new NullPointerException("type is null");
Class<? extends Service> serviceClass = types.get(type);
@@ -969,7 +993,7 @@ public class ConfigurationFactory implem
String name = (String) entry.getKey();
for (String prefix : Arrays.asList(fullPrefix, fullPrefix2,
shortPrefix, shortPrefix2)) {
- if (name.toLowerCase().startsWith(prefix.toLowerCase())){
+ if (name.toLowerCase().startsWith(prefix.toLowerCase())) {
name = name.substring(prefix.length());
@@ -1044,7 +1068,7 @@ public class ConfigurationFactory implem
if (openejb != null) {
for (Resource resource : openejb.getResource()) {
ArrayList<String> types = new ArrayList<String>();
- if (resource.getType() != null){
+ if (resource.getType() != null) {
types.add(resource.getType());
}
if (isResourceType("Resource", types, type) &&
implies(required, resource.getProperties())) {
@@ -1060,7 +1084,7 @@ public class ConfigurationFactory implem
OpenEjbConfiguration runningConfig = getRunningConfig();
if (runningConfig != null) {
for (ResourceInfo resourceInfo :
runningConfig.facilities.resources) {
- if (resourceInfo.id == id){
+ if (resourceInfo.id == id) {
return resourceInfo;
}
}
@@ -1068,7 +1092,7 @@ public class ConfigurationFactory implem
if (sys != null) {
for (ResourceInfo resourceInfo : sys.facilities.resources) {
- if (resourceInfo.id == id){
+ if (resourceInfo.id == id) {
return resourceInfo;
}
}
@@ -1086,7 +1110,7 @@ public class ConfigurationFactory implem
List<String> containerIds = new ArrayList<String>();
OpenEjbConfiguration runningConfig = getRunningConfig();
- if (runningConfig != null){
+ if (runningConfig != null) {
for (ContainerInfo containerInfo :
runningConfig.containerSystem.containers) {
containerIds.add(containerInfo.id);
}
@@ -1152,7 +1176,7 @@ public class ConfigurationFactory implem
private static final int GREATER = 1;
private static final int LESS = -1;
- public ResourceInfoComparator(List<ResourceInfo> resources){
+ public ResourceInfoComparator(List<ResourceInfo> resources) {
ids = new ArrayList<String>();
for (ResourceInfo info : resources) {
ids.add(info.id);
@@ -1180,28 +1204,28 @@ public class ConfigurationFactory implem
}
// a has a ref and b doesn't
- if (refA != null && refB == null){
+ if (refA != null && refB == null) {
return GREATER;
}
// b has a ref and a doesn't
- if (refB != null && refA == null){
+ if (refB != null && refA == null) {
return LESS;
}
return EQUAL;
}
- public int hasReference(ResourceInfo info){
+ public int hasReference(ResourceInfo info) {
for (Object value : info.properties.values()) {
if (ids.contains(value)) return GREATER;
}
return EQUAL;
}
- public String getReference(ResourceInfo info){
+ public String getReference(ResourceInfo info) {
for (Object value : info.properties.values()) {
- value = ((String)value).trim();
+ value = ((String) value).trim();
if (ids.contains(value)) return (String) value;
}
return null;
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckDescriptorLocation.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckDescriptorLocation.java?rev=1165141&r1=1165140&r2=1165141&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckDescriptorLocation.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckDescriptorLocation.java
Mon Sep 5 01:26:40 2011
@@ -16,85 +16,78 @@
*/
package org.apache.openejb.config.rules;
+import org.apache.openejb.config.EjbModule;
+import org.apache.xbean.finder.ResourceFinder;
+
import java.io.File;
import java.io.IOException;
import java.net.MalformedURLException;
-import java.net.URI;
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
-import org.apache.openejb.config.AppModule;
-import org.apache.openejb.config.EjbModule;
-import org.apache.xbean.finder.ResourceFinder;
-
public class CheckDescriptorLocation extends ValidationBase {
- EjbModule currentModule;
-
- @Override
- public void validate(EjbModule ejbModule)
- {
- URL baseUrl=null;
- this.currentModule=ejbModule;
- File file=ejbModule.getFile();
- if(file!=null)
- {
- validateDescriptorsAreNotPlacedInRoot(file);
- }
-
- }
-
- private void validateDescriptorsAreNotPlacedInRoot(File file) {
- ResourceFinder resourceFinder = null;
- try {
- resourceFinder = new
ResourceFinder(file.toURI().toURL());
- } catch (MalformedURLException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- //ResourceFinder resourceFinder = new ResourceFinder(baseUrl);
+ EjbModule currentModule;
+
+ @Override
+ public void validate(EjbModule ejbModule) {
+ URL baseUrl = null;
+ this.currentModule = ejbModule;
+ File file = ejbModule.getFile();
+ if (file != null) {
+ validateDescriptorsAreNotPlacedInRoot(file);
+ }
+
+ }
+
+ private void validateDescriptorsAreNotPlacedInRoot(File file) {
+ ResourceFinder resourceFinder = null;
+ try {
+ resourceFinder = new ResourceFinder(file.toURI().toURL());
+ } catch (MalformedURLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ //ResourceFinder resourceFinder = new ResourceFinder(baseUrl);
Map<String, URL> descriptorsPlacedInWrongLocation =
getDescriptorsPlacedInWrongLocation(resourceFinder);
-
- if(descriptorsPlacedInWrongLocation.size()>0)
- {
-
warnIncorrectLocationOfDescriptors(descriptorsPlacedInWrongLocation);
-
- }
- }
-
- private static Map<String, URL> getDescriptorsPlacedInWrongLocation(
- ResourceFinder finder) {
- Map<String,URL> descriptorsMap = null;
+ if (descriptorsPlacedInWrongLocation.size() > 0) {
+
warnIncorrectLocationOfDescriptors(descriptorsPlacedInWrongLocation);
+
+ }
+ }
+
+ private static Map<String, URL> getDescriptorsPlacedInWrongLocation(
+ ResourceFinder finder) {
+
+ Map<String, URL> descriptorsMap = null;
try {
- descriptorsMap=
retrieveDescriptorsPlacedInWrongLocation(finder);
- } catch (IOException e) {
- e.printStackTrace();
- }
+ descriptorsMap = retrieveDescriptorsPlacedInWrongLocation(finder);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
return descriptorsMap;
- }
-
+ }
- private static Map<String, URL>
retrieveDescriptorsPlacedInWrongLocation(
- ResourceFinder finder) throws IOException {
- final Map<String, URL> map = new HashMap<String, URL>();
- String[] known = {"web.xml", "ejb-jar.xml", "openejb-jar.xml",
"env-entries.properties", "beans.xml", "ra.xml", "application.xml",
"application-client.xml", "persistence.xml"};
- for (String descriptor : known) {
- final URL url = finder.getResource(descriptor);
- if (url != null) map.put(descriptor, url);
- }
+ private static Map<String, URL> retrieveDescriptorsPlacedInWrongLocation(
+ ResourceFinder finder) throws IOException {
+ final Map<String, URL> map = new HashMap<String, URL>();
+ String[] known = {"web.xml", "ejb-jar.xml", "openejb-jar.xml",
"env-entries.properties", "beans.xml", "ra.xml", "application.xml",
"application-client.xml", "persistence.xml"};
+ for (String descriptor : known) {
+ final URL url = finder.getResource(descriptor);
+ if (url != null) map.put(descriptor, url);
+ }
return map;
- }
-
+ }
+
private void warnIncorrectLocationOfDescriptors(Map<String, URL>
descriptorsPlacedInWrongLocation) {
- for(Map.Entry<String, URL>
map:descriptorsPlacedInWrongLocation.entrySet())
- {
+ for (Map.Entry<String, URL> map :
descriptorsPlacedInWrongLocation.entrySet()) {
-
warn(currentModule.toString(),"descriptor.incorrectLocation",map.getKey(),map.getValue());
- }
- }
+ warn(currentModule.toString(), "descriptor.incorrectLocation",
map.getKey(), map.getValue());
+ }
+ }
}
\ No newline at end of file
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Exceptions.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Exceptions.java?rev=1165141&r1=1165140&r2=1165141&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Exceptions.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Exceptions.java
Mon Sep 5 01:26:40 2011
@@ -16,17 +16,16 @@
*/
package org.apache.openejb.util;
-import static org.apache.openejb.util.StringUtilities.join;
-
-import java.io.IOException;
-import java.io.NotSerializableException;
+import org.apache.openejb.OpenEjbContainer.NoModulesFoundException;
import javax.ejb.EJBException;
import javax.naming.AuthenticationException;
import javax.naming.NamingException;
import javax.transaction.RollbackException;
+import java.io.IOException;
+import java.io.NotSerializableException;
-import org.apache.openejb.OpenEjbContainer.NoModulesFoundException;
+import static org.apache.openejb.util.StringUtilities.join;
/**
* @version $Rev$ $Date$
@@ -35,6 +34,7 @@ public class Exceptions {
/**
* Removes the need for a cast when using initCause
+ *
* @param t
* @param cause
* @return
@@ -44,68 +44,67 @@ public class Exceptions {
}
- public static IOException newIOException(String message, Throwable cause){
+ public static IOException newIOException(String message, Throwable cause) {
return initCause(new IOException(message), cause);
}
- public static IOException newIOException(Throwable cause){
+ public static IOException newIOException(Throwable cause) {
return initCause(new IOException(), cause);
}
- public static NamingException newNamingException(String message, Throwable
cause){
+ public static NamingException newNamingException(String message, Throwable
cause) {
return initCause(new NamingException(message), cause);
}
- public static NamingException newNamingException(Throwable cause){
+ public static NamingException newNamingException(Throwable cause) {
return initCause(new NamingException(), cause);
}
- public static RollbackException newRollbackException(String message,
Throwable cause){
+ public static RollbackException newRollbackException(String message,
Throwable cause) {
return initCause(new RollbackException(message), cause);
}
- public static RollbackException newRollbackException(Throwable cause){
+ public static RollbackException newRollbackException(Throwable cause) {
return initCause(new RollbackException(), cause);
}
- public static AuthenticationException newAuthenticationException(String
message, Throwable cause){
+ public static AuthenticationException newAuthenticationException(String
message, Throwable cause) {
return initCause(new AuthenticationException(message), cause);
}
- public static AuthenticationException newAuthenticationException(Throwable
cause){
+ public static AuthenticationException newAuthenticationException(Throwable
cause) {
return initCause(new AuthenticationException(), cause);
}
- public static EJBException newEJBException(String message, Throwable
cause){
+ public static EJBException newEJBException(String message, Throwable
cause) {
return initCause(new EJBException(message), cause);
}
- public static EJBException newEJBException(Throwable cause){
+ public static EJBException newEJBException(Throwable cause) {
return initCause(new EJBException(), cause);
}
- public static NotSerializableException newNotSerializableException(String
message, Throwable cause){
+ public static NotSerializableException newNotSerializableException(String
message, Throwable cause) {
return initCause(new NotSerializableException(message), cause);
}
- public static NotSerializableException
newNotSerializableException(Throwable cause){
+ public static NotSerializableException
newNotSerializableException(Throwable cause) {
return initCause(new NotSerializableException(), cause);
}
-
- public static NoModulesFoundException newNoModulesFoundException()
- {
- return new NoModulesFoundException(join("No modules found to deploy.",
- "1)Maybe descriptors are placed in incorrect location.",
- "Descriptors could go under: ",
+
+ public static NoModulesFoundException newNoModulesFoundException() {
+ return new NoModulesFoundException(join("No modules found to deploy.",
+ "1)Maybe descriptors are placed in incorrect location.",
+ "Descriptors could go under: ",
"<base-dir>/META-INF or <base-dir>/WEB-INF", "but not directly
under <base-dir>",
"Check 'Application Discovery via the Classpath' docs page for
more info",
"2)Maybe no modules are present in the classpath.",
"Is 'openejb.base' system property pointing to the intended
location?")
- );
+ );
}
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/StringUtilities.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/StringUtilities.java?rev=1165141&r1=1165140&r2=1165141&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/StringUtilities.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/StringUtilities.java
Mon Sep 5 01:26:40 2011
@@ -102,15 +102,14 @@ public class StringUtilities {
return stringList.toString();
}
-
- public static String join(String... linesToBreak )
- {
- StringBuilder out = new StringBuilder("\n");
- for (Object line : linesToBreak) {
- out.append(line.toString()).append("\n");
- }
- int lastBreak = out.lastIndexOf("\n");
- return out.replace(lastBreak, lastBreak+1, "").toString();
- }
+
+ public static String join(String... linesToBreak) {
+ StringBuilder out = new StringBuilder("\n");
+ for (Object line : linesToBreak) {
+ out.append(line.toString()).append("\n");
+ }
+ int lastBreak = out.lastIndexOf("\n");
+ return out.replace(lastBreak, lastBreak + 1, "").toString();
+ }
}
\ No newline at end of file
Modified:
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/CheckDescriptorLocationTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/CheckDescriptorLocationTest.java?rev=1165141&r1=1165140&r2=1165141&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/CheckDescriptorLocationTest.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/CheckDescriptorLocationTest.java
Mon Sep 5 01:26:40 2011
@@ -59,5 +59,4 @@ public class CheckDescriptorLocationTest
public void sayCheese() {
}
}
-
}
\ No newline at end of file
Modified:
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/CheckDescriptorLocationTestFileDeletionHelper.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/CheckDescriptorLocationTestFileDeletionHelper.java?rev=1165141&r1=1165140&r2=1165141&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/CheckDescriptorLocationTestFileDeletionHelper.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/CheckDescriptorLocationTestFileDeletionHelper.java
Mon Sep 5 01:26:40 2011
@@ -16,41 +16,41 @@
*/
package org.apache.openejb.config;
-import static org.junit.Assert.*;
+import org.junit.Test;
import java.io.File;
import java.util.Arrays;
import java.util.List;
-import org.junit.Test;
+import static org.junit.Assert.assertTrue;
public class CheckDescriptorLocationTestFileDeletionHelper {
- @Test
- public void deleteFile() {
- File fileLocation = new
File(System.getProperty("java.io.tmpdir"));
- assertTrue(fileLocation.isDirectory());
- List<File> asList = Arrays.asList(fileLocation.listFiles());
- deleteTestCreatedFiles(asList);
-
- }
-
- private void deleteTestCreatedFiles(List<File> asList) {
- for (File file : asList) {
- deleteOrMarkForDelete(file);
- }
- }
-
- private void deleteOrMarkForDelete(File file) {
- if (file.getName().contains(
-
CheckDescriptorLocationTest.JAR_FILENAME_PREFIX)) {
-
- boolean deleted = file.delete();
- if (!deleted) {
- file.deleteOnExit();
- }
+ @Test
+ public void deleteFile() {
+ File fileLocation = new File(System.getProperty("java.io.tmpdir"));
+ assertTrue(fileLocation.isDirectory());
+ List<File> asList = Arrays.asList(fileLocation.listFiles());
+ deleteTestCreatedFiles(asList);
+
+ }
+
+ private void deleteTestCreatedFiles(List<File> asList) {
+ for (File file : asList) {
+ deleteOrMarkForDelete(file);
+ }
+ }
+
+ private void deleteOrMarkForDelete(File file) {
+ if (file.getName().contains(
+ CheckDescriptorLocationTest.JAR_FILENAME_PREFIX)) {
+
+ boolean deleted = file.delete();
+ if (!deleted) {
+ file.deleteOnExit();
+ }
- }
- }
+ }
+ }
}
Modified:
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/util/Archives.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/util/Archives.java?rev=1165141&r1=1165140&r2=1165141&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/util/Archives.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/util/Archives.java
Mon Sep 5 01:26:40 2011
@@ -33,8 +33,8 @@ import static junit.framework.Assert.ass
/**
-* @version $Rev$ $Date$
-*/
+ * @version $Rev$ $Date$
+ */
public class Archives {
public static File fileArchive(Class[] classes) throws IOException {
@@ -48,7 +48,7 @@ public class Archives {
File classpath = File.createTempFile("test", "archive");
assertTrue(classpath.delete());
assertTrue(classpath.mkdirs());
- System.out.println("Archive file path:"+classpath.getCanonicalPath());
+ System.out.println("Archive file path:" +
classpath.getCanonicalPath());
for (Class clazz : classes) {
String name = clazz.getName().replace('.', File.separatorChar) +
".class";
@@ -97,8 +97,8 @@ public class Archives {
return jarArchive(new HashMap<String, String>(), "temp", classes);
}
-
- public static File jarArchive(Map<String, String> entries, String
archiveNamePrefix,Class... classes) throws IOException {
+
+ public static File jarArchive(Map<String, String> entries, String
archiveNamePrefix, Class... classes) throws IOException {
ClassLoader loader = Archives.class.getClassLoader();
