diff --git a/grizzly.spec b/grizzly.spec
index 7e5c8d9..417f895 100644
--- a/grizzly.spec
+++ b/grizzly.spec
@@ -1,61 +1,55 @@
 %global namedreltag %{nil}
 %global namedversion %{version}%{?namedreltag}
 Name:          grizzly
-Version:       2.3.2
-Release:       2%{?dist}
+Version:       2.3.3
+Release:       1%{?dist}
 Summary:       Java NIO Server Framework
-Group:         Development/Libraries
 # see Grizzly_THIRDPARTYLICENSEREADME.txt
 License:       (CDDL or GPLv2 with exceptions) and BSD and ASL 2.0 and Public Domain
 URL:           http://grizzly.java.net/
 # git clone git://java.net/grizzly~git
-# (cd grizzly~git/ && git archive --format=tar --prefix=grizzly-2.3.2/ 2_3_2 | xz > ../grizzly-2.3.2.tar.xz)
+# (cd grizzly~git/ && git archive --format=tar --prefix=grizzly-2.3.3/ 2_3_3 | xz > ../grizzly-2.3.3.tar.xz)
 Source0:       %{name}-%{namedversion}.tar.xz
-# forcing the use of required glassfish-servlet-api 3.1 apis 
-Source1:       %{name}-2.3-beta8-depmap
 # wget -O glassfish-LICENSE.txt https://svn.java.net/svn/glassfish~svn/tags/legal-1.1/src/main/resources/META-INF/LICENSE.txt
 # grizzly package don't include the license file
-Source2:       glassfish-LICENSE.txt
+Source1:       glassfish-LICENSE.txt
 # require glassfish-servlet-api 3.1-b05
 # add support for glassfish-servlet-api 3.1-b07
 Patch0:        %{name}-2.3-beta9-WebappContext.patch
 Patch1:        %{name}-2.3-beta9-ServletInputStreamImpl.patch
 Patch2:        %{name}-2.3-rc4-ServletOutputStreamImpl.patch
-
+# build support for glassfish-jaxws >= 2.2.7
+Patch3:        %{name}-2.3.3-jaws227.patch
 
 BuildRequires: java-devel
-BuildRequires: jvnet-parent
-
-BuildRequires: felix-osgi-compendium
-BuildRequires: felix-osgi-core
-BuildRequires: glassfish-gmbal
+BuildRequires: mvn(net.java:jvnet-parent)
+# Multiple packages with the same gId:aId.
 BuildRequires: glassfish-servlet-api
-# BuildRequires: jboss-servlet-3.0-api
+BuildRequires: mvn(com.sun.xml.ws:jaxws-rt)
+BuildRequires: mvn(org.glassfish.gmbal:gmbal)
+BuildRequires: mvn(org.glassfish.gmbal:gmbal-api-only)
+BuildRequires: mvn(org.osgi:org.osgi.compendium)
+BuildRequires: mvn(org.osgi:org.osgi.core)
 
 # test deps
-# BuildRequires: jersey
-BuildRequires: junit
+%if 0
+# Circular deps
+BuildRequires: mvn(com.sun.jersey:jersey-client)
+BuildRequires: mvn(com.sun.jersey:jersey-server)
+BuildRequires: mvn(com.sun.jersey:jersey-servlet)
+%endif
+BuildRequires: mvn(junit:junit)
 
 BuildRequires: maven-local
-BuildRequires: maven-compiler-plugin
 BuildRequires: maven-enforcer-plugin
-BuildRequires: maven-install-plugin
 BuildRequires: maven-istack-commons-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
 BuildRequires: maven-plugin-build-helper
 BuildRequires: maven-plugin-bundle
-BuildRequires: maven-resources-plugin
 BuildRequires: maven-source-plugin
-BuildRequires: maven-surefire-plugin
 BuildRequires: maven-surefire-provider-junit4
 BuildRequires: maven-war-plugin
-
-Requires:      glassfish-gmbal
+# Require servlet-api 3.1
 Requires:      glassfish-servlet-api
-# Requires:      jboss-servlet-3.0-api
-
-Requires:      java
 BuildArch:     noarch
 
 # config
@@ -72,15 +66,12 @@ standalone project. Grizzly goals is to help developers to
 build scalable and robust servers using NIO.
 
 %package samples
-Group:         Development/Libraries
 Summary:       Grizzly samples
-Requires:      %{name} = %{version}-%{release}
 
 %description samples
 This package contains samples for %{name}.
 
 %package javadoc
-Group:         Documentation
 Summary:       Javadoc for %{name}
 
 %description javadoc
@@ -94,33 +85,28 @@ find . -name '*.class' -delete
 %patch0 -p0
 %patch1 -p0
 %patch2 -p0
+%patch3 -p0
 
 # unavailable deps
-# com.agilejava.docbkx:docbkx-maven-plugin:jar:2.0.9
-%pom_disable_module documentation/
 # org.jvnet.maven-antrun-extended-plugin maven-antrun-extended-plugin
 %pom_disable_module bundles extras
-# com.sun.xml.ws jaxws-rt :2.2.5
-%pom_disable_module http-server-jaxws extras
+%pom_disable_module bundles modules
 
 # org.ops4j maven-pax-plugin  1.5
 %pom_disable_module grizzly-httpservice extras
 
-# org.codehaus.mojo clirr-maven-plugin
-# %%pom_disable_module bundles modules
 
-# com.sun.xml.ws jaxws-rt 2.2.5
-# org.glassfish.grizzly grizzly-http-server-jaxws
-%pom_disable_module http-jaxws-samples samples
+# XMvn don't support file with war extension
+%pom_disable_module comet samples
 
 # remove internal libraries
 %pom_disable_module websockets/chat samples
 
 # org.glassfish.hk2 config-generator 2.1.57
-%pom_disable_module config modules
-%pom_remove_dep org.codehaus.mojo:cobertura-maven-plugin
-%pom_remove_dep org.apache.felix:maven-bundle-plugin
-%pom_remove_dep org.apache.maven:maven-plugin-tools-api
+#%%pom_disable_module config modules
+#%%pom_remove_dep :cobertura-maven-plugin
+%pom_remove_dep :maven-bundle-plugin
+%pom_remove_dep :maven-plugin-tools-api
 %pom_remove_dep org.glassfish.hk2:config-types
 %pom_remove_dep org.glassfish.hk2:core
 %pom_remove_dep org.glassfish.hk2:hk2-config
@@ -129,17 +115,14 @@ find . -name '*.class' -delete
 
 %pom_xpath_remove "pom:build/pom:extensions/pom:extension[pom:artifactId = 'wagon-webdav']"
 
-# jetty-npn https://bugzilla.redhat.com/show_bug.cgi?id=953055
-
-# org.glassfish.main.common:glassfish-api:4.0-b72
-# org.glassfish.main.common:internal-api:4.0-b72
 # org.glassfish.grizzly:grizzly-npn-api:1.0
 %pom_disable_module spdy modules
+%pom_disable_module spdy-samples samples
 
 %pom_remove_dep org.glassfish.grizzly:documentation bom
 %pom_remove_dep org.glassfish.grizzly:grizzly-comet-server bom
 %pom_remove_dep org.glassfish.grizzly:grizzly-compression bom
-%pom_remove_dep org.glassfish.grizzly:grizzly-config bom
+#%%pom_remove_dep org.glassfish.grizzly:grizzly-config bom
 %pom_remove_dep org.glassfish.grizzly:grizzly-core bom
 %pom_remove_dep org.glassfish.grizzly:grizzly-http-all bom
 %pom_remove_dep org.glassfish.grizzly:grizzly-http-server-core bom
@@ -150,22 +133,21 @@ find . -name '*.class' -delete
 %pom_remove_dep org.glassfish.grizzly.osgi:grizzly-httpservice bom
 %pom_remove_dep org.glassfish.grizzly.osgi:grizzly-httpservice-bundle bom
 
-%pom_remove_plugin org.codehaus.mojo:clirr-maven-plugin
-%pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin
-%pom_remove_plugin org.glassfish.copyright:glassfish-copyright-maven-plugin
-%pom_remove_plugin org.jvnet.maven-antrun-extended-plugin:maven-antrun-extended-plugin
-%pom_remove_plugin org.sonatype.plugins:nexus-maven-plugin
+#%%pom_remove_plugin :clirr-maven-plugin
+%pom_remove_plugin :findbugs-maven-plugin
+%pom_remove_plugin :glassfish-copyright-maven-plugin
+%pom_remove_plugin :maven-antrun-extended-plugin
+%pom_remove_plugin :nexus-maven-plugin
 
 # circular deps
 %if 0
 %pom_add_dep com.sun.jersey:jersey-servlet:'${jersey-version}':test modules/http-servlet
 %else
-%pom_remove_dep com.sun.jersey:jersey-client modules/http-servlet
-%pom_remove_dep com.sun.jersey:jersey-server modules/http-servlet
+%pom_remove_dep com.sun.jersey: modules/http-servlet
 rm -rf modules/http-servlet/src/test/java/filter/*
 %endif
 
-cp -p %{SOURCE2} LICENSE.txt
+cp -p %{SOURCE1} LICENSE.txt
 cp -p modules/grizzly/src/main/resources/Grizzly_THIRDPARTYLICENSEREADME.txt .
 sed -i 's/\r//' LICENSE.txt Grizzly_THIRDPARTYLICENSEREADME.txt
 
@@ -174,119 +156,55 @@ sed -i 's|${version}|${project.version}|' $(find . -name "pom.xml")
 sed -i 's|${pom.url}|${project.url}|' $(find . -name "pom.xml")
 sed -i 's|${pom.version}|${project.version}|' $(find . -name "pom.xml")
 
-%if %{?fedora} > 18
 # fix aId for new istack-commons maven plugin
 sed -i "s|<artifactId>maven-istack-commons-plugin|<artifactId>istack-commons-maven-plugin|" $(find . -name "pom.xml")
-%endif
+
+# Force servlet 3.1 apis
+%pom_remove_dep javax.servlet:servlet-api modules/comet
+%pom_add_dep javax.servlet:javax.servlet-api::provided modules/comet
 
 %build
 
-mvn-rpmbuild -Dmaven.test.failure.ignore=true -Dmaven.local.depmap.file="%{SOURCE1}" install javadoc:aggregate
+# comet
+# websockets/chat
+%mvn_package ":%{name}-samples" samples
+%mvn_package ":%{name}-framework-samples" samples
+%mvn_package ":%{name}-http-ajp-samples" samples
+%mvn_package ":%{name}-http-jaxws-samples" samples
+%mvn_package ":%{name}-http-multipart-samples" samples
+%mvn_package ":%{name}-http-samples" samples
+%mvn_package ":%{name}-http-server-samples" samples
+%mvn_package ":%{name}-portunif-samples" samples
+# forcing the use of required glassfish-servlet-api 3.1 apis 
+%mvn_build -- -Dmaven.test.failure.ignore=true -Dmaven.local.depmap.file="%{_mavendepmapfragdir}/glassfish-servlet-api.xml"
 
 %install
+%mvn_install
 
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-project.pom
-%add_maven_depmap JPP.%{name}-%{name}-project.pom
-
-install -pm 644 bom/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-bom.pom
-%add_maven_depmap JPP.%{name}-%{name}-bom.pom
-
-install -pm 644 extras/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-extras.pom
-%add_maven_depmap JPP.%{name}-%{name}-extras.pom
-
-mkdir -p %{buildroot}%{_javadir}/%{name}
-# http-server-jaxws grizzly-httpservice
-for ext in http-server-multipart \
-  http-servlet-extras; do
-  install -m 644 extras/${ext}/target/%{name}-${ext}-%{namedversion}.jar \
-    %{buildroot}%{_javadir}/%{name}/%{name}-${ext}.jar
-  install -pm 644 extras/${ext}/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-${ext}.pom
-%add_maven_depmap JPP.%{name}-%{name}-${ext}.pom %{name}/%{name}-${ext}.jar
-done
-
-install -pm 644 modules/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-modules.pom
-%add_maven_depmap JPP.%{name}-%{name}-modules.pom
-
-# modules/config
-
-install -m 644 modules/grizzly/target/grizzly-framework-%{namedversion}.jar \
-  %{buildroot}%{_javadir}/%{name}/%{name}-framework.jar
 (
   cd %{buildroot}%{_javadir}/%{name}
   ln -sf %{name}-framework.jar %{name}.jar
 )
-install -pm 644 modules/grizzly/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-framework.pom
-%add_maven_depmap JPP.%{name}-%{name}-framework.pom %{name}/%{name}-framework.jar
-
-# bundles spdy
-for mod in comet \
-  http \
-  http-ajp \
-  http-server \
-  http-servlet \
-  portunif \
-  rcm \
-  websockets; do
-  install -m 644 modules/${mod}/target/%{name}-${mod}-%{namedversion}.jar \
-    %{buildroot}%{_javadir}/%{name}/%{name}-${mod}.jar
-  install -pm 644 modules/${mod}/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-${mod}.pom
-%add_maven_depmap JPP.%{name}-%{name}-${mod}.pom %{name}/%{name}-${mod}.jar
-done
-
-install -pm 644 samples/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-samples.pom
-%add_maven_depmap -f samples JPP.%{name}-%{name}-samples.pom
-
-install -pm 644 samples/comet/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-comet-samples.pom
-%add_maven_depmap -f samples JPP.%{name}-%{name}-comet-samples.pom
-install -pm 644 samples/comet/comet-counter/target/%{name}-comet-counter.war \
-    %{buildroot}%{_javadir}/%{name}/
-install -pm 644 samples/comet/comet-counter/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-comet-counter.pom
-%add_maven_depmap -f samples JPP.%{name}-%{name}-comet-counter.pom %{name}/%{name}-comet-counter.war
-
-install -pm 644 samples/portunif/target/%{name}-portunif-samples-%{namedversion}.jar \
-    %{buildroot}%{_javadir}/%{name}/%{name}-portunif-samples.jar
-install -pm 644 samples/portunif/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-portunif-samples.pom
-%add_maven_depmap -f samples JPP.%{name}-%{name}-portunif-samples.pom %{name}/%{name}-portunif-samples.jar
 
-# websockets/chat
-# http-jaxws-samples
-for s in framework-samples \
-  http-ajp-samples \
-  http-multipart-samples \
-  http-samples \
-  http-server-samples; do
-  install -pm 644 samples/${s}/target/%{name}-${s}-%{namedversion}.jar \
-    %{buildroot}%{_javadir}/%{name}/%{name}-${s}.jar
-  install -pm 644 samples/${s}/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-${s}.pom
-  %add_maven_depmap -f samples JPP.%{name}-%{name}-${s}.pom %{name}/%{name}-${s}.jar
-done
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%files
+%files -f .mfiles
 %dir %{_javadir}/%{name}
-%{_javadir}/%{name}/%{name}*.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-*.pom
-%{_mavendepmapfragdir}/%{name}
+%{_javadir}/%{name}/%{name}.jar
 %doc LICENSE.txt Grizzly_THIRDPARTYLICENSEREADME.txt
 
 # config
 
-%files samples
-%{_javadir}/%{name}/%{name}-*-samples.jar
-%{_javadir}/%{name}/%{name}-*.war
-%{_mavenpomdir}/JPP.%{name}-%{name}-comet-counter.pom
-%{_mavenpomdir}/JPP.%{name}-%{name}*-samples.pom
-%{_mavendepmapfragdir}/%{name}-samples
+%files samples -f .mfiles-samples
 %doc LICENSE.txt Grizzly_THIRDPARTYLICENSEREADME.txt
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE.txt Grizzly_THIRDPARTYLICENSEREADME.txt
 
 %changelog
+* Wed Jul 10 2013 gil cattaneo <puntogil@libero.it> 2.3.3-1
+- update to 2.3.3
+- built with XMvn
+- enable glassfish-jaws support
+
 * Sat May 18 2013 gil cattaneo <puntogil@libero.it> 2.3.2-2
 - fix aId for new istack-commons maven plugin