Work on compiling plugins with JspC

plugins/openfire-plugin-assembly-descriptor/src/main/resources/assemblies/openfire-plugin-assembly.xml

@@ -33,26 +33,26 @@
             <!-- Don't include jsp pages, they will be compiled -->
             <excludes>
                 <exclude>**/*.jsp</exclude>
+                <exclude>web/WEB-INF/web.xml</exclude>
             </excludes>
         </fileSet>
 
-        <!-- The jar-file containing the compiled plugin code. This is assembled
-             by the assembly descriptor "openfire-plugin-jar" -->
+        <!-- web.xml (it will be modified by JspC -->
         <fileSet>
+            <outputDirectory>/web/WEB-INF</outputDirectory>
             <directory>${project.build.directory}</directory>
-            <outputDirectory>/lib</outputDirectory>
             <includes>
-                <include>plugin-${project.artifactId}.jar</include>
+                <include>web.xml</include>
             </includes>
         </fileSet>
 
-        <!-- The jar-file containing the pre-compiled JSP pages. This is assembled
-             by the assembly descriptor "openfire-plugin-jspc" -->
+        <!-- The jar-file containing the compiled plugin code. This is assembled
+             by the assembly descriptor "openfire-plugin-jar" -->
         <fileSet>
             <directory>${project.build.directory}</directory>
             <outputDirectory>/lib</outputDirectory>
             <includes>
-                <include>plugin-${project.artifactId}-jspc.jar</include>
+                <include>plugin-${project.artifactId}.jar</include>
             </includes>
         </fileSet>
 

plugins/openfire-plugin-assembly-descriptor/src/main/resources/assemblies/openfire-plugin-jspc.xml

-<assembly
-        xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-    <id>openfire-plugin-jspc</id>
-    <formats>
-        <format>jar</format>
-    </formats>
-    <includeBaseDirectory>false</includeBaseDirectory>
-</assembly>
\ No newline at end of file

plugins/pom.xml

@@ -113,6 +113,11 @@
                             <goals>
                                 <goal>jspc</goal>
                             </goals>
+                            <configuration>
+                                <jspc>
+                                    <package>org.jivesoftware.openfire.plugin.${project.artifactId}</package>
+                                </jspc>
+                            </configuration>
                         </execution>
                     </executions>
                     <dependencies>