Improved portability and reliability of archetypes.

psl-archetype/psl-archetype-example/src/main/resources/archetype-resources/src/main/java/BasicExample.groovy

@@ -20,13 +20,13 @@
 package ${package};
 
 //Imports the standard groovy interface to PSL, the attribute similarity function interface and the database drivers
-import ${groupId}.psl.groovy.*;
-import ${groupId}.psl.database.RDBMS.DatabaseDriver;
-import ${groupId}.psl.model.function.AttributeSimilarityFunction;
-import ${groupId}.psl.config.*;
+import edu.umd.cs.psl.groovy.*;
+import edu.umd.cs.psl.database.RDBMS.DatabaseDriver;
+import edu.umd.cs.psl.model.function.AttributeSimilarityFunction;
+import edu.umd.cs.psl.config.*;
 
 //Import this package if you want to use attribute similarity functions that come with PSL
-import ${groupId}.psl.ui.functions.textsimilarity.*;
+import edu.umd.cs.psl.ui.functions.textsimilarity.*;
 
 /* The first thing we need to do, is initialize a PSLModel which is the core component of PSL.
  * The constructor argument is the context in which the PSLModel is defined. Predicates defined
@@ -185,7 +185,7 @@ result.printAtoms(samePerson,true);
  * This simple implementation checks whether two strings are identical, in which case it returns 1.0
  * or different (returning 0.0).
  *
- * The package ${groupId}.psl.model.similarityfunction.attribute contains additional and more sophisticated
+ * The package edu.umd.cs.psl.model.similarityfunction.attribute contains additional and more sophisticated
  * string similarity functions of which BasicStringSimilarity is probably the most general.
  */
 class MyStringSimilarity implements AttributeSimilarityFunction {

psl-archetype/psl-archetype-example/src/main/resources/archetype-resources/src/main/java/OntologyAlignment.groovy

@@ -19,14 +19,14 @@
  */
 package ${package};
 
-import ${groupId}.psl.groovy.*;
-import ${groupId}.psl.database.RDBMS.DatabaseDriver;
-import ${groupId}.psl.ui.functions.textsimilarity.*;
-import ${groupId}.psl.model.function.AttributeSimilarityFunction;
-import ${groupId}.psl.model.predicate.Predicate;
-import ${groupId}.psl.model.argument.type.*;
-import ${groupId}.psl.model.predicate.type.*;
-import ${groupId}.psl.config.*;
+import edu.umd.cs.psl.groovy.*;
+import edu.umd.cs.psl.database.RDBMS.DatabaseDriver;
+import edu.umd.cs.psl.ui.functions.textsimilarity.*;
+import edu.umd.cs.psl.model.function.AttributeSimilarityFunction;
+import edu.umd.cs.psl.model.predicate.Predicate;
+import edu.umd.cs.psl.model.argument.type.*;
+import edu.umd.cs.psl.model.predicate.type.*;
+import edu.umd.cs.psl.config.*;
 
 PSLModel m = new PSLModel(this);
 

psl-archetype/psl-archetype-example/src/main/resources/archetype-resources/src/main/java/external/ExternalFunctionExample.groovy

@@ -20,10 +20,10 @@
 package ${package}.external;
 
 //Imports the standard groovy interface to PSL, the attribute similarity function interface and the database drivers
-import ${groupId}.psl.config.*
-import ${groupId}.psl.database.RDBMS.DatabaseDriver
-import ${groupId}.psl.groovy.*
-import ${groupId}.psl.ui.functions.textsimilarity.*
+import edu.umd.cs.psl.config.*
+import edu.umd.cs.psl.database.RDBMS.DatabaseDriver
+import edu.umd.cs.psl.groovy.*
+import edu.umd.cs.psl.ui.functions.textsimilarity.*
 
 /* The first thing we need to do, is initialize a PSLModel which is the core component of PSL.
  * The constructor argument is the context in which the PSLModel is defined. Predicates defined

psl-archetype/psl-archetype-example/src/main/resources/archetype-resources/src/main/java/external/SameNameFunction.java

@@ -19,13 +19,13 @@
  */
 package ${package}.external;
 
-import ${groupId}.psl.model.argument.Attribute;
-import ${groupId}.psl.model.argument.GroundTerm;
-import ${groupId}.psl.model.argument.type.ArgumentType;
-import ${groupId}.psl.model.argument.type.ArgumentTypes;
-import ${groupId}.psl.model.function.ExternalFunction;
-import ${groupId}.psl.model.predicate.type.PredicateType;
-import ${groupId}.psl.model.predicate.type.PredicateTypes;
+import edu.umd.cs.psl.model.argument.Attribute;
+import edu.umd.cs.psl.model.argument.GroundTerm;
+import edu.umd.cs.psl.model.argument.type.ArgumentType;
+import edu.umd.cs.psl.model.argument.type.ArgumentTypes;
+import edu.umd.cs.psl.model.function.ExternalFunction;
+import edu.umd.cs.psl.model.predicate.type.PredicateType;
+import edu.umd.cs.psl.model.predicate.type.PredicateTypes;
 
 /**
  * This is an example external function.

psl-archetype/psl-archetype-groovy/src/main/resources/archetype-resources/src/main/java/App.groovy

@@ -1 +1,3 @@
+package ${package};
+
 println "This source file is a place holder for the tree of groovy and java sources for your PSL project."

psl-archetype/psl-archetype-groovy/src/main/resources/archetype-resources/src/main/resources/log4j.properties

@@ -1,9 +1,12 @@
-# Set root logger level to the designated level and its only appender to A1.
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+${symbol_pound} Set root logger level to the designated level and its only appender to A1.
 log4j.rootLogger=ERROR, A1
 
-# A1 is set to be a ConsoleAppender.
+${symbol_pound} A1 is set to be a ConsoleAppender.
 log4j.appender.A1=org.apache.log4j.ConsoleAppender
 
-# A1 uses PatternLayout.
+${symbol_pound} A1 uses PatternLayout.
 log4j.appender.A1.layout=org.apache.log4j.PatternLayout
 log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n

psl-archetype/psl-archetype-groovy/src/main/resources/archetype-resources/src/main/resources/psl.properties

@@ -1 +1,4 @@
-# PSL properties can be specified in this file. See the ConfigManager class for more information.
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+${symbol_pound} PSL properties can be specified in this file. See the ConfigManager class for more information.