Index: trunk/ehcache/management-ehcache-impl/ehcache-rest-agent/pom.xml
===================================================================
diff -u -N -r7574 -r7669
--- trunk/ehcache/management-ehcache-impl/ehcache-rest-agent/pom.xml	(.../pom.xml)	(revision 7574)
+++ trunk/ehcache/management-ehcache-impl/ehcache-rest-agent/pom.xml	(.../pom.xml)	(revision 7669)
@@ -155,7 +155,8 @@
             <artifactId>maven-shade-plugin</artifactId>
             <configuration>
               <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
-              <useBaseVersion>true</useBaseVersion> 
+              <useBaseVersion>true</useBaseVersion>
+              <createSourcesJar>true</createSourcesJar> 
               <shadedArtifactAttached>false</shadedArtifactAttached>
               <keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
               <artifactSet>
Index: trunk/ehcache/distribution/pom.xml
===================================================================
diff -u -N -r7325 -r7669
--- trunk/ehcache/distribution/pom.xml	(.../pom.xml)	(revision 7325)
+++ trunk/ehcache/distribution/pom.xml	(.../pom.xml)	(revision 7669)
@@ -33,8 +33,15 @@
       <artifactId>ehcache</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
-    </dependency>  
+    </dependency> 
     <dependency>
+      <groupId>net.sf.ehcache</groupId>
+      <artifactId>ehcache</artifactId>
+      <version>${project.version}</version>
+      <classifier>javadoc</classifier>
+      <scope>provided</scope>
+    </dependency>    
+    <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
       <scope>provided</scope>
Index: trunk/ehcache/ehcache/pom.xml
===================================================================
diff -u -N -r7624 -r7669
--- trunk/ehcache/ehcache/pom.xml	(.../pom.xml)	(revision 7624)
+++ trunk/ehcache/ehcache/pom.xml	(.../pom.xml)	(revision 7669)
@@ -10,7 +10,7 @@
   </parent>
 
   <artifactId>ehcache</artifactId>
-  <packaging>${packagingType}</packaging>
+  <packaging>jar</packaging>
   <name>ehcache</name>
   <description>Ehcache is an open source, standards-based cache used to boost performance,
   offload the database and simplify scalability. Ehcache is robust, proven and full-featured and
@@ -31,7 +31,6 @@
     <terracotta.kit.path>${project.build.directory}/tmp/terracotta</terracotta.kit.path>
     <gmaven-plugin.version>1.4</gmaven-plugin.version>
     <skipJavadoc>false</skipJavadoc>
-    <packagingType>jar</packagingType>
     <devmode>true</devmode>
   </properties>
 
@@ -85,76 +84,9 @@
               <goal>copy-dependencies</goal>
             </goals>
           </execution>
-
-          <execution>
-            <id>copy-sources</id>
-            <phase>package</phase>
-            <goals>
-              <goal>copy</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>net.sf.ehcache.internal</groupId>
-                  <artifactId>ehcache-core</artifactId>
-                  <version>${project.version}</version>
-                  <classifier>sources</classifier>
-                  <overWrite>true</overWrite>
-                  <destFileName>${project.artifactId}-${project.version}-sources.jar</destFileName>
-                </artifactItem>
-              </artifactItems>
-              <outputDirectory>${project.build.directory}</outputDirectory>
-            </configuration>
-          </execution>
-
-          <execution>
-            <id>copy-javadoc</id>
-            <phase>package</phase>
-            <goals>
-              <goal>copy</goal>
-            </goals>
-            <configuration>
-              <skip>${skipJavadoc}</skip>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>net.sf.ehcache.internal</groupId>
-                  <artifactId>ehcache-core</artifactId>
-                  <version>${project.version}</version>
-                  <classifier>javadoc</classifier>
-                  <overWrite>true</overWrite>
-                  <destFileName>${project.artifactId}-${project.version}-javadoc.jar</destFileName>
-                </artifactItem>
-              </artifactItems>
-              <outputDirectory>${project.build.directory}</outputDirectory>
-            </configuration>
-          </execution>
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-javadoc</id>
-            <phase>package</phase>
-            <goals>
-              <goal>attach-artifact</goal>
-            </goals>
-            <configuration>
-              <skipAttach>${skipJavadoc}</skipAttach>
-              <artifacts>
-                <!-- sources artifact attached by default -->
-                <artifact>
-                  <file>${project.build.directory}/${project.artifactId}-${project.version}-javadoc.jar</file>
-                  <type>jar</type>
-                  <classifier>javadoc</classifier>
-                </artifact>
-              </artifacts>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
@@ -274,45 +206,48 @@
           <value>false</value>
         </property>
       </activation>
-      <properties>
-        <packagingType>bundle</packagingType>
-      </properties>
       <build>
         <plugins>
           <plugin>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>maven-bundle-plugin</artifactId>
-            <version>2.3.7</version>
-            <extensions>true</extensions>
-            <configuration>
-              <manifestLocation>${project.build.directory}</manifestLocation>
-              <instructions>
-                <Bundle-Name>${project.artifactId}</Bundle-Name>
-                <Bundle-SymbolicName>${project.groupId}</Bundle-SymbolicName>
-                <Import-Package>bitronix.tm;resolution:=optional,
-              bitronix.tm.resource.ehcache;resolution:=optional,
-              com.atomikos.*;resolution:=optional,
-              com.atomikos.icatch.jta;resolution:=optional,
-              weblogic.transaction;resolution:=optional,
-              javax.transaction;resolution:=optional,
-              javax.servlet;resolution:=optional,
-              javax.net.ssl;resolution:=optional,
-              org.hibernate.*;resolution:=optional,
-              org.terracotta.toolkit.*;resolution:=optional,
-              !sun.misc,*
-                </Import-Package>
-                <Export-Package>net.sf.ehcache.*</Export-Package>
-                <Private-Package>org.terracotta.*</Private-Package>
-                <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
-              </instructions>
-              <excludeDependencies>*;scope=provided|runtime</excludeDependencies>
-            </configuration>
-          </plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <version>2.9</version>
+            <executions>
+              <execution>
+                <id>create-javadoc</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+                <configuration>
+                  <skip>${skipJavadoc}</skip>
+                  <author>true</author>
+                  <minmemory>128m</minmemory>
+                  <maxmemory>512</maxmemory>              
+                  <quiet>true</quiet>
+                  <header><![CDATA[<a href="/" target="_top">ehcache</a>]]></header>
+                  <doctitle>${project.name} ${project.version} API</doctitle>
+                  <windowtitle>${project.name} ${project.version} API</windowtitle>
+                  <bottom>Copyright 2001-{currentYear}, Terracotta, Inc.</bottom>
+                  <overview>${basedir}/src/main/java/net/sf/ehcache/overview.html</overview>
+                  <includeDependencySources>true</includeDependencySources>      
+                  <dependencySourceIncludes>
+                    <dependencySourceInclude>net.sf.ehcache.internal:*</dependencySourceInclude>
+                  </dependencySourceIncludes>
+                  <dependencySourceExcludes>
+                    <dependencySourceExclude>net.sf.ehcache.internal:ehcache-rest-agent</dependencySourceExclude>
+                  </dependencySourceExcludes>
+                </configuration>                
+              </execution>
+            </executions>
+          </plugin>       
+          
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-shade-plugin</artifactId>
             <configuration>
               <useBaseVersion>true</useBaseVersion>
+              <createSourcesJar>true</createSourcesJar>
               <artifactSet>
                 <includes>
                   <include>net.sf.ehcache.internal:*</include>
@@ -324,6 +259,7 @@
                   <artifact>*:*</artifact>
                   <excludes>
                     <exclude>**/META-INF/maven/net.sf.ehcache.internal/**</exclude>
+                    <exclude>**/META-INF/maven/org.terracotta.internal/**</exclude>
                     <exclude>**/license.txt</exclude>
                     <exclude>**/thirdpartylicenses.txt</exclude>
                     <exclude>META-INF/*.SF</exclude>
@@ -355,30 +291,83 @@
             </executions>
           </plugin>
           <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <version>1.7</version>
+            <executions>
+              <execution>
+                <id>unpack-jar-for-bundling</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <target>
+                    <unzip src="${project.build.directory}/${project.artifactId}-${project.version}.jar" dest="${project.build.outputDirectory}" />
+                  </target>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>           
+          <plugin>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>maven-bundle-plugin</artifactId>
+            <version>2.3.7</version>
+            <configuration>
+              <manifestLocation>${project.build.directory}</manifestLocation>
+              <instructions>
+                <Bundle-Name>${project.artifactId}</Bundle-Name>
+                <Bundle-SymbolicName>${project.groupId}</Bundle-SymbolicName>
+                <Import-Package>bitronix.tm;resolution:=optional,
+              bitronix.tm.resource.ehcache;resolution:=optional,
+              com.atomikos.*;resolution:=optional,
+              com.atomikos.icatch.jta;resolution:=optional,
+              weblogic.transaction;resolution:=optional,
+              javax.transaction;resolution:=optional,
+              javax.servlet;resolution:=optional,
+              javax.net.ssl;resolution:=optional,
+              org.hibernate.*;resolution:=optional,
+              org.terracotta.toolkit.*;resolution:=optional,
+              !sun.misc,*
+                </Import-Package>
+                <Export-Package>net.sf.ehcache.*</Export-Package>
+                <Private-Package>org.terracotta.*</Private-Package>
+                <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
+              </instructions>
+              <excludeDependencies>*;scope=provided|runtime</excludeDependencies>
+            </configuration>
+            <executions>
+              <execution>
+                <id>generate-osgi-headers</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>manifest</goal>
+                </goals>
+              </execution>
+            </executions>            
+          </plugin>
+          <plugin>
             <groupId>org.codehaus.gmaven</groupId>
             <artifactId>gmaven-plugin</artifactId>
+            <version>${gmaven-plugin.version}</version>
             <executions>
               <execution>
-                <id>inject-correct-pom-to-jar</id>
+                <id>repackage-jar</id>
                 <phase>package</phase>
                 <goals>
                   <goal>execute</goal>
                 </goals>
                 <configuration>
                   <source>
-                def jarFile = new File(project.build.directory,
-                "${project.artifactId}-${project.version}.jar")
-                ant.jar(destfile: jarFile, update: "true") {
-                zipfileset(file: new File(project.build.directory,
-                "dependency-reduced-pom.xml"),
-                fullpath:
-                "META-INF/maven/${project.groupId}/${project.artifactId}/pom.xml")
-                }
+                    def jarFile = new File(project.build.directory, "${project.artifactId}-${project.version}.jar")
+                    ant.copy(file: new File(project.build.directory, "dependency-reduced-pom.xml"),
+                             tofile: new File(project.build.outputDirectory, "META-INF/maven/${project.groupId}/${project.artifactId}/pom.xml"))
+                    ant.jar(destfile: jarFile, basedir: new File(project.build.outputDirectory).getAbsolutePath(), manifest: new File(project.build.directory, "MANIFEST.MF"))
                   </source>
                 </configuration>
               </execution>
             </executions>
-          </plugin>
+          </plugin>           
         </plugins>
       </build>
     </profile>
Index: trunk/ehcache/ehcache-core/pom.xml
===================================================================
diff -u -N -r7468 -r7669
--- trunk/ehcache/ehcache-core/pom.xml	(.../pom.xml)	(revision 7468)
+++ trunk/ehcache/ehcache-core/pom.xml	(.../pom.xml)	(revision 7669)
@@ -24,7 +24,6 @@
     <testResources>src/test/resources</testResources>
     <name>ehcache</name>
     <skipCheckstyle>false</skipCheckstyle>
-    <skipJavadoc>false</skipJavadoc>
     <tests.supplemental.args/>
   </properties>
 
@@ -153,34 +152,6 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <skip>${skipJavadoc}</skip>
-          <author>true</author>
-          <!--<destDir>${project.build.directory}/site/javadoc</destDir> -->
-          <header><![CDATA[<a href="/" target="_top">ehcache</a>]]></header>
-          <minmemory>128m</minmemory>
-          <maxmemory>512</maxmemory>
-          <overview>${basedir}/src/main/java/net/sf/ehcache/overview.html
-          </overview>
-          <use>true</use>
-          <version>true</version>
-          <windowtitle>${project.name} ${project.version} API</windowtitle>
-          <quiet>true</quiet>
-        </configuration>
-        <executions>
-          <execution>
-            <id>core-javadoc</id>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      
-      <plugin>
         <groupId>org.terracotta</groupId>
         <artifactId>maven-forge-plugin</artifactId>
         <executions>
@@ -551,25 +522,13 @@
       </build>
     </profile>
 
-    <!-- Profile for building ehcache skipping javadoc and checkstyle -->
+    <!-- Profile for building ehcache skipping checkstyle -->
     <profile>
       <id>fast</id>
       <properties>
         <skipCheckstyle>true</skipCheckstyle>
-        <skipJavadoc>true</skipJavadoc>
       </properties>
     </profile>
-    <profile>
-      <id>skipJavadoc</id>
-      <properties>
-        <skipJavadoc>true</skipJavadoc>
-      </properties>
-      <activation>
-        <file>
-          <exists>${user.home}/.skipJavadoc</exists>
-        </file>
-      </activation>
-    </profile>
   </profiles>
 
   <!-- The JBoss repository is only here to satisfy the 'provided' dependency