[jboss-cvs] JBossBlog SVN: r240 - in trunk: resources and 3 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: adamw
Date: 2008-03-05 07:31:55 -0500 (Wed, 05 Mar 2008)
New Revision: 240

Modified:
   trunk/build.properties
   trunk/build.xml
   trunk/resources-portlet/WEB-INF/web.xml
   trunk/resources/components.properties
   trunk/src/action/org/jboss/blog/session/security/SecurityModBean.java
   trunk/src/portal/org/jboss/blog/session/security/external/SecurityBootstrap.java
Log:


Modified: trunk/build.properties
===================================================================
--- trunk/build.properties	2008-03-05 09:08:12 UTC (rev 239)
+++ trunk/build.properties	2008-03-05 12:31:55 UTC (rev 240)
@@ -1,5 +1,6 @@
 #jboss.home = /Users/adamwarski/portal-extensions/feeds/binaries
-jboss.home = /Users/adamwarski/jboss/jboss-4.2
-#jboss.home = /Users/adamwarski/jboss/jboss-4.0.5
-profile = dev
+#jboss.home = /Users/adamwarski/jboss/jboss-4.2
+jboss.home = /Users/adamwarski/jboss/jboss-4.0.5
+#profile = dev
+profile = prod
 #jboss.home = /Users/adamwarski/jboss/jboss-design
\ No newline at end of file

Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2008-03-05 09:08:12 UTC (rev 239)
+++ trunk/build.xml	2008-03-05 12:31:55 UTC (rev 240)
@@ -173,7 +173,7 @@
                 <include name="*.*"/>
                 <include name="classes/**/*.*"/>
                 <exclude name="classes/**/*.class"/>
-                <exclude name="web-${profile}.xml" />
+                <exclude name="web-*.xml" />
             </fileset>
             <filterset>
                 <filter token="debug" value="${debug}" />
@@ -377,7 +377,7 @@
         <touch file="${ear.deploy.dir}/META-INF/application.xml"/>
     </target>
 
-    <target name="deploy" depends="archive" description="Deploy to JBoss AS">
+    <target name="deploy" depends="clean,archive" description="Deploy to JBoss AS">
         <fail unless="jboss.home">jboss.home not set</fail>
         <copy todir="${deploy.dir}" file="${dist.dir}/${project.name}.ear" />
         <copy todir="${deploy.dir}" file="${dist.dir}/${jar.api.name}" />

Modified: trunk/resources/components.properties
===================================================================
--- trunk/resources/components.properties	2008-03-05 09:08:12 UTC (rev 239)
+++ trunk/resources/components.properties	2008-03-05 12:31:55 UTC (rev 240)
@@ -1,2 +1,2 @@
 jndiPattern \#{ejbName}/local
-debug true
+debug false

Modified: trunk/resources-portlet/WEB-INF/web.xml
===================================================================
--- trunk/resources-portlet/WEB-INF/web.xml	2008-03-05 09:08:12 UTC (rev 239)
+++ trunk/resources-portlet/WEB-INF/web.xml	2008-03-05 12:31:55 UTC (rev 240)
@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
          version="2.5">
-    <context-param>
+    <!--<context-param>
         <param-name>sourceBasePath</param-name>
         <param-value>/Users/adamwarski/blog/view-portlet</param-value>
     </context-param>
@@ -20,5 +20,5 @@
         <dispatcher>FORWARD</dispatcher>
         <dispatcher>INCLUDE</dispatcher>
         <dispatcher>REQUEST</dispatcher>
-    </filter-mapping>
+    </filter-mapping>-->
 </web-app>

Modified: trunk/src/action/org/jboss/blog/session/security/SecurityModBean.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/security/SecurityModBean.java	2008-03-05 09:08:12 UTC (rev 239)
+++ trunk/src/action/org/jboss/blog/session/security/SecurityModBean.java	2008-03-05 12:31:55 UTC (rev 240)
@@ -140,8 +140,7 @@
         return getMapping(getRole(), idForRole);
     }
 
-    @Restrict("#{identity.hasPermission('security_group', 'add', securityMod.role, securityMod.group, securityMod.feed)}")
-    public void addSecurityGroup() {
+    public void addSecurityGroupAsSuperUser() {
         SecurityGroup sg = externalSecurityService.getUnrestrictedSecurityGroup(getRestrictedSecurityGroup());
         SecurityMapping mapping = getMapping();
 
@@ -162,6 +161,11 @@
                 externalSecurityService.getDisplayName(sg), param);
     }
 
+    @Restrict("#{identity.hasPermission('security_group', 'add', securityMod.role, securityMod.group, securityMod.feed)}")
+    public void addSecurityGroup() {
+        addSecurityGroupAsSuperUser();
+    }
+
     @Restrict("#{identity.hasPermission('security_group', 'delete', securityMod.role, securityMod.group, securityMod.feed)}")
     public void deleteSecurityGroup() {
         SecurityGroup sg = externalSecurityService.getUnrestrictedSecurityGroup(getRestrictedSecurityGroup());

Modified: trunk/src/portal/org/jboss/blog/session/security/external/SecurityBootstrap.java
===================================================================
--- trunk/src/portal/org/jboss/blog/session/security/external/SecurityBootstrap.java	2008-03-05 09:08:12 UTC (rev 239)
+++ trunk/src/portal/org/jboss/blog/session/security/external/SecurityBootstrap.java	2008-03-05 12:31:55 UTC (rev 240)
@@ -36,7 +36,7 @@
                 securityMod.setRole(FeedsSecurityRole.ADMIN);
                 securityMod.setRestrictedSecurityGroup(group);
 
-                securityMod.addSecurityGroup();
+                securityMod.addSecurityGroupAsSuperUser();
 
                 entityManager.flush();
             }