Author: kmalhi
Date: Tue Aug 24 19:28:50 2010
New Revision: 988680
URL: http://svn.apache.org/viewvc?rev=988680&view=rev
Log:
Added some comments for the confluence snippets plugin. Need this to add
documentation for the validation framework
Modified:
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/ValidateModules.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInjectionTargetsTest.java
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=988680&r1=988679&r2=988680&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
Tue Aug 24 19:28:50 2010
@@ -69,7 +69,7 @@ public class AppValidator {
ValidationResults[] ejbSets = new ValidationResults[sets.size()];
return sets.toArray(ejbSets);
}
-
+// START SNIPPET : code2
public AppModule validate(final AppModule appModule) {
try {
ValidationRule[] rules = getValidationRules();
@@ -85,7 +85,8 @@ public class AppValidator {
}
return appModule;
}
-
+// START SNIPPET : code2
+// START SNIPPET : code1
protected ValidationRule[] getValidationRules() {
ValidationRule[] rules = new ValidationRule[]{
new CheckClasses(),
@@ -99,7 +100,7 @@ public class AppValidator {
};
return rules;
}
-
+// END SNIPPET : code1
public void printResults(ValidationResults set) {
if (!set.hasErrors() && !set.hasFailures() && (!PRINT_WARNINGS ||
!set.hasWarnings())) {
return;
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=988680&r1=988679&r2=988680&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
Tue Aug 24 19:28:50 2010
@@ -139,13 +139,13 @@ public class ConfigurationFactory implem
chain.add(new GeneratedClientModules.Prune());
chain.add(new ClearEmptyMappedName());
-
+ //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
chain.add(new InitEjbDeployments());
if (options.get(DEBUGGABLE_VM_HACKERY_PROPERTY, false)){
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ValidateModules.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ValidateModules.java?rev=988680&r1=988679&r2=988680&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ValidateModules.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ValidateModules.java
Tue Aug 24 19:28:50 2010
@@ -21,6 +21,7 @@ import org.apache.openejb.OpenEJBExcepti
/**
* @version $Rev$ $Date$
*/
+// START SNIPPET : code
public class ValidateModules implements DynamicDeployer {
public AppModule deploy(AppModule appModule) throws OpenEJBException {
@@ -29,3 +30,4 @@ public class ValidateModules implements
}
}
+// END SNIPPET : code
\ No newline at end of file
Modified:
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInjectionTargetsTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInjectionTargetsTest.java?rev=988680&r1=988679&r2=988680&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInjectionTargetsTest.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInjectionTargetsTest.java
Tue Aug 24 19:28:50 2010
@@ -27,6 +27,7 @@ import org.junit.runner.RunWith;
/**
* @version $Rev$ $Date$
*/
+// START SNIPPET : code
@RunWith(ValidationRunner.class)
public class CheckInjectionTargetsTest {
@Keys(@Key(value="injectionTarget.nameContainsSet",count=2,type=KeyType.WARNING))
@@ -55,3 +56,4 @@ public class CheckInjectionTargetsTest {
public void sayCheese(){}
}
}
+// END SNIPPET : code
\ No newline at end of file
