[jboss-cvs] JBossBlog SVN: r127 - in trunk: blog-common and 15 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jun 21 09:10:00 EDT 2007
Author: adamw
Date: 2007-06-21 09:09:59 -0400 (Thu, 21 Jun 2007)
New Revision: 127
Added:
trunk/lib/jboss-portal/portal-common-lib.jar
trunk/lib/jboss-portal/portal-jems-lib.jar
trunk/lib/log4j/
trunk/lib/log4j/log4j-1.2.9.jar
Removed:
trunk/blog-common/blog-common.iml
trunk/blog-services/blog-core.iml
trunk/blog-services/src/etc/Messages.properties
trunk/blog-view/blog-core.iml
trunk/blog-view/src/web/WEB-INF/tags/
trunk/lib/xdoclet/
Modified:
trunk/blog-services/build.xml
trunk/blog-services/src/etc/META-INF/jboss-service.xml
trunk/blog-services/src/java/org/jboss/blog/service/configuration/PortletPreferencesBlogConfigurationService.java
trunk/blog-services/src/java/org/jboss/blog/service/model/DelegatingModelService.java
trunk/blog-services/src/java/org/jboss/blog/service/model/caching/CachingBlogModelService.java
trunk/blog-services/src/java/org/jboss/blog/service/model/rome/RomeParsingBlogModelService.java
trunk/blog-services/src/java/org/jboss/blog/service/name/PortletPreferencesBlogNameService.java
trunk/blog-services/src/java/org/jboss/blog/service/permissions/DefaultBlogPermissionsService.java
trunk/blog-view/build.xml
trunk/blog-view/src/web/WEB-INF/portlet-instances.xml
trunk/blog-view/src/web/blog_view.jsp
trunk/blog-view/src/web/post_view.jsp
trunk/build.xml
Log:
Refactoring
Deleted: trunk/blog-common/blog-common.iml
===================================================================
--- trunk/blog-common/blog-common.iml 2007-06-21 12:05:41 UTC (rev 126)
+++ trunk/blog-common/blog-common.iml 2007-06-21 13:09:59 UTC (rev 127)
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="JAVA_MODULE">
- <component name="ModuleRootManager" />
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/rome/jdom-1.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/rome/rome-0.9.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/jboss/jboss-j2ee.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/jboss/jboss-system.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/jboss/jboss-jmx.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="library" name="jsf" level="project" />
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/jboss-portal/portal-identity-lib.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/portlet/portlet-api-lib.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntryProperties />
- </component>
-</module>
-
Deleted: trunk/blog-services/blog-core.iml
===================================================================
--- trunk/blog-services/blog-core.iml 2007-06-21 12:05:41 UTC (rev 126)
+++ trunk/blog-services/blog-core.iml 2007-06-21 13:09:59 UTC (rev 127)
@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="J2EE_WEB_MODULE">
- <component name="AppServerSpecificValidatorsManager" />
- <component name="ModuleRootManager" />
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_4" inherit-compiler-output="true">
- <exclude-output />
- <exclude-exploded />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$APPLICATION_HOME_DIR$/lib/javaee.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="library" name="jsf" level="project" />
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/facelets/jsf-facelets-portlet.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/facelets/jsf-facelets.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/jboss/jboss-jmx.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/jboss/jboss-system.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/portlet/portlet-api-lib.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/rome/jdom-1.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="library" name="xdoclet" level="project" />
- <orderEntry type="module" module-name="blog-common" />
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/jboss-jaae/jboss-acl.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/jboss-jaae/jboss-identity-management.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/jboss-jaae/jboss-security-common.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/jboss-portal/portal-faces-lib.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/jboss-portal/portal-identity-lib.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/rome/rome-0.9.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntryProperties />
- </component>
- <component name="WebModuleBuildComponent">
- <setting name="EXPLODED_URL" value="file://" />
- <setting name="EXPLODED_ENABLED" value="false" />
- <setting name="JAR_URL" value="file://" />
- <setting name="JAR_ENABLED" value="false" />
- <setting name="SYNC_EXPLODED_DIR" value="true" />
- <setting name="BUILD_MODULE_ON_FRAME_DEACTIVATION" value="false" />
- <setting name="BUILD_EXTERNAL_DEPENDENCIES" value="false" />
- <setting name="RUN_JASPER_VALIDATION" value="true" />
- </component>
- <component name="WebModuleProperties">
- <containerElement type="module" name="blog-common">
- <attribute name="method" value="0" />
- <attribute name="URI" value="/WEB-INF/classes" />
- </containerElement>
- <containerElement type="module" name="blog-model">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/classes" />
- </containerElement>
- <containerElement type="library" level="module">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/jsf-facelets-portlet.jar" />
- <url>jar://$MODULE_DIR$/../lib/facelets/jsf-facelets-portlet.jar!/</url>
- </containerElement>
- <containerElement type="library" level="module">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/jsf-facelets.jar" />
- <url>jar://$MODULE_DIR$/../lib/facelets/jsf-facelets.jar!/</url>
- </containerElement>
- <containerElement type="library" level="module">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/jboss-acl.jar" />
- <url>jar://$MODULE_DIR$/../lib/jboss-jaae/jboss-acl.jar!/</url>
- </containerElement>
- <containerElement type="library" level="module">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/jboss-identity-management.jar" />
- <url>jar://$MODULE_DIR$/../lib/jboss-jaae/jboss-identity-management.jar!/</url>
- </containerElement>
- <containerElement type="library" level="module">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/jboss-security-common.jar" />
- <url>jar://$MODULE_DIR$/../lib/jboss-jaae/jboss-security-common.jar!/</url>
- </containerElement>
- <containerElement type="library" level="module">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/portal-faces-lib.jar" />
- <url>jar://$MODULE_DIR$/../lib/jboss-portal/portal-faces-lib.jar!/</url>
- </containerElement>
- <containerElement type="library" level="module">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/portal-identity-lib.jar" />
- <url>jar://$MODULE_DIR$/../lib/jboss-portal/portal-identity-lib.jar!/</url>
- </containerElement>
- <containerElement type="library" level="module">
- <attribute name="method" value="0" />
- <attribute name="URI" value="/WEB-INF/lib/jboss-j2ee.jar" />
- <url>jar://$MODULE_DIR$/../lib/jboss/jboss-j2ee.jar!/</url>
- </containerElement>
- <containerElement type="library" level="module">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/jboss-jmx.jar" />
- <url>jar://$MODULE_DIR$/../lib/jboss/jboss-jmx.jar!/</url>
- </containerElement>
- <containerElement type="library" level="module">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/jboss-system.jar" />
- <url>jar://$MODULE_DIR$/../lib/jboss/jboss-system.jar!/</url>
- </containerElement>
- <containerElement type="library" level="module">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/portlet-api-lib.jar" />
- <url>jar://$MODULE_DIR$/../lib/portlet/portlet-api-lib.jar!/</url>
- </containerElement>
- <containerElement type="library" level="module">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/jdom-1.0.jar" />
- <url>jar://$MODULE_DIR$/../lib/rome/jdom-1.0.jar!/</url>
- </containerElement>
- <containerElement type="library" level="module">
- <attribute name="method" value="0" />
- <attribute name="URI" value="/WEB-INF/lib/rome-0.9.jar" />
- <url>jar://$MODULE_DIR$/../lib/rome/rome-0.9.jar!/</url>
- </containerElement>
- <containerElement type="library" level="module">
- <attribute name="method" value="0" />
- <attribute name="URI" value="<N/A>" />
- <url>jar://$APPLICATION_HOME_DIR$/lib/javaee.jar!/</url>
- </containerElement>
- <containerElement type="library" name="jsf" level="project">
- <attribute name="method" value="0" />
- <attribute name="URI" value="<N/A>" />
- </containerElement>
- <containerElement type="library" name="xdoclet" level="project">
- <attribute name="method" value="0" />
- <attribute name="URI" value="/WEB-INF/lib" />
- </containerElement>
- <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/web/WEB-INF/web.xml" optional="false" version="2.3" />
- <webroots>
- <root url="file://$MODULE_DIR$/src/web" relative="/" />
- </webroots>
- </component>
- <component name="WeblogicWebModuleProperties" />
-</module>
-
Modified: trunk/blog-services/build.xml
===================================================================
--- trunk/blog-services/build.xml 2007-06-21 12:05:41 UTC (rev 126)
+++ trunk/blog-services/build.xml 2007-06-21 13:09:59 UTC (rev 127)
@@ -6,36 +6,16 @@
<fileset refid="rome.jars" />
<fileset refid="jboss.jars" />
<fileset refid="jboss.portal.jars" />
- <fileset refid="portlet.jars" />
- <fileset refid="jstl.jars" />
- <fileset refid="servlet.jars" />
-
- <fileset refid="log4j.jar" />
+ <fileset refid="portlet.jars" />
+ <fileset refid="log4j.jars" />
</path>
- <!-- XDoclet task definition -->
- <path id="xdoclet.jars">
- <fileset dir="../lib/xdoclet"><include name="**/*.jar"/></fileset>
- </path>
-
- <taskdef name="jmxdoclet"
- classname="xdoclet.modules.jmx.JMXDocletTask"
- classpathref="xdoclet.jars"/>
- <taskdef name="hibernatedoclet"
- classname="xdoclet.modules.hibernate.HibernateDocletTask"
- classpathref="xdoclet.jars" />
-
<!-- BUILD TARGETS -->
<target name="init">
</target>
- <target name="copy-libs-for-servlet" unless="jboss.portal.present">
- <copy todir="${dist.lib.dir}"><fileset refid="myfaces.jars"/></copy>
- <copy todir="${dist.lib.dir}"><fileset refid="facelets.jars"/></copy>
- </target>
-
<target name="build">
<mkdir dir="${build}" />
<!-- Compiling the source -->
@@ -50,11 +30,6 @@
<include name="**/*.xml"/>
</fileset>
</copy>
- <!-- Creating the xmbean xml-s -->
- <jmxdoclet destdir="${build}">
- <fileset dir="${src.java}"><include name="**/*.java"/></fileset>
- <jbossxmbean />
- </jmxdoclet>
</target>
<target name="dist">
@@ -66,22 +41,11 @@
</copy>
<!-- Creating the jar with the classes -->
- <jar destfile="${dist.lib.dir}/jboss-blog-core.jar" basedir="${build}" />
+ <jar destfile="${dist.lib.dir}/jboss-blog-services.jar" basedir="${build}" />
- <!-- Creating the web application -->
- <mkdir dir="${dist.war.dir}" />
- <copy todir="${dist.war.dir}">
- <fileset dir="${src.web}"><include name="**/*" /></fileset>
- </copy>
-
<!-- Copying dependency jars -->
<copy todir="${dist.lib.dir}"><fileset refid="rome.jars"/></copy>
- <copy todir="${dist.lib.dir}"><fileset refid="jboss.portal.identity.jars"/></copy>
- <copy todir="${dist.lib.dir}"><fileset refid="jexl.jars"/></copy>
-
- <copy todir="${dist.war.dir}/WEB-INF/lib"><fileset refid="jstl.jars"/></copy>
-
- <antcall target="copy-libs-for-servlet" />
+ <!-- <copy todir="${dist.lib.dir}"><fileset refid="jboss.portal.jems.jars"/></copy> -->
</target>
<target name="clean">
Modified: trunk/blog-services/src/etc/META-INF/jboss-service.xml
===================================================================
--- trunk/blog-services/src/etc/META-INF/jboss-service.xml 2007-06-21 12:05:41 UTC (rev 126)
+++ trunk/blog-services/src/etc/META-INF/jboss-service.xml 2007-06-21 13:09:59 UTC (rev 127)
@@ -6,7 +6,9 @@
<!-- Main blog service -->
<mbean code="org.jboss.blog.service.BlogServiceImpl"
name="blog:service=Main"
- xmbean-dd="org/jboss/blog/service/BlogServiceImpl.xml">
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean />
<depends optional-attribute-name="NameService"
proxy-type="attribute">blog:service=Name</depends>
<depends optional-attribute-name="ModelService"
@@ -15,51 +17,58 @@
proxy-type="attribute">blog:service=Permissions</depends>
<depends optional-attribute-name="ConfigurationService"
proxy-type="attribute">blog:service=Configuration</depends>
- <depends optional-attribute-name="StoreService"
- proxy-type="attribute">blog:service=Store</depends>
</mbean>
<!-- Name service -->
<mbean code="org.jboss.blog.service.name.PortletPreferencesBlogNameService"
name="blog:service=Name"
- xmbean-dd="org/jboss/blog/service/name/PortletPreferencesBlogNameService.xml" />
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+
+ <xmbean />
+ </mbean>
<!-- Configuration service -->
<mbean code="org.jboss.blog.service.configuration.PortletPreferencesBlogConfigurationService"
name="blog:service=Configuration"
- xmbean-dd="org/jboss/blog/service/configuration/PortletPreferencesBlogConfigurationService.xml" />
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean />
+ </mbean>
<!-- Model service -->
<mbean code="org.jboss.blog.service.model.DelegatingModelService"
name="blog:service=Model"
- xmbean-dd="org/jboss/blog/service/model/DelegatingModelService.xml">
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean />
<depends optional-attribute-name="ExternalDelegateModelService"
proxy-type="attribute">blog:service=CachingModel</depends>
<depends optional-attribute-name="InternalDelegateModelService"
- proxy-type="attribute">blog:service=StoreModel</depends>
+ proxy-type="attribute">blog:service=CachingModel</depends>
</mbean>
- <mbean code="org.jboss.blog.service.model.StoreModelService"
- name="blog:service=StoreModel"
- xmbean-dd="org/jboss/blog/service/model/StoreModelService.xml">
- <depends optional-attribute-name="StoreService"
- proxy-type="attribute">blog:service=Store</depends>
- </mbean>
<mbean code="org.jboss.blog.service.model.caching.CachingBlogModelService"
name="blog:service=CachingModel"
- xmbean-dd="org/jboss/blog/service/model/caching/CachingBlogModelService.xml">
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean />
<attribute name="UpdateInterval">60000</attribute>
<depends optional-attribute-name="DelegateModelService"
proxy-type="attribute">blog:service=RomeParsingModel</depends>
</mbean>
<mbean code="org.jboss.blog.service.model.rome.RomeParsingBlogModelService"
name="blog:service=RomeParsingModel"
- xmbean-dd="org/jboss/blog/service/model/rome/RomeParsingBlogModelService.xml">
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean />
</mbean>
<!-- Permissions service -->
<mbean code="org.jboss.blog.service.permissions.DefaultBlogPermissionsService"
name="blog:service=Permissions"
- xmbean-dd="org/jboss/blog/service/permissions/DefaultBlogPermissionsService.xml">
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean />
<!--<depends>portal:service=Module,type=IdentityServiceController</depends>-->
</mbean>
</server>
\ No newline at end of file
Deleted: trunk/blog-services/src/etc/Messages.properties
===================================================================
Modified: trunk/blog-services/src/java/org/jboss/blog/service/configuration/PortletPreferencesBlogConfigurationService.java
===================================================================
--- trunk/blog-services/src/java/org/jboss/blog/service/configuration/PortletPreferencesBlogConfigurationService.java 2007-06-21 12:05:41 UTC (rev 126)
+++ trunk/blog-services/src/java/org/jboss/blog/service/configuration/PortletPreferencesBlogConfigurationService.java 2007-06-21 13:09:59 UTC (rev 127)
@@ -11,16 +11,10 @@
/**
* A name service which reads blog configuration from portlet preferences.
* @author Adam Warski (adamw at aster.pl)
- *
- * @jmx.mbean
- * @jboss.xmbean
*/
public class PortletPreferencesBlogConfigurationService extends AbstractBlogService
implements BlogConfigurationService {
- /**
- * @jmx.managed-operation
- * @jmx.managed-parameter type="java.lang.Object"
- */
+
public Integer getNumberOfPostsPerPage(Object request) {
BasicTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
try {
@@ -32,10 +26,6 @@
}
}
- /**
- * @jmx.managed-operation
- * @jmx.managed-parameter type="java.lang.Object"
- */
public Boolean getViewPostsOnSeparatePage(Object request) {
BasicTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
return Boolean.valueOf(PortletTools.getPortletPreference(
@@ -43,10 +33,6 @@
"viewPostsOnSeparatePage"));
}
- /**
- * @jmx.managed-operation
- * @jmx.managed-parameter type="java.lang.Object"
- */
public Boolean getViewAllPosts(Object request) {
BasicTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
return Boolean.valueOf(PortletTools.getPortletPreference(
@@ -54,10 +40,6 @@
"viewAllPosts"));
}
- /**
- * @jmx.managed-operation
- * @jmx.managed-parameter type="java.lang.Object"
- */
public Boolean getCommentsEnabled(Object request) {
BasicTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
return Boolean.valueOf(PortletTools.getPortletPreference(
@@ -65,10 +47,6 @@
"commentsEnabled"));
}
- /**
- * @jmx.managed-operation
- * @jmx.managed-parameter type="java.lang.Object"
- */
public Boolean getShowLinkToOriginalBlog(Object request) {
BasicTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
return Boolean.valueOf(PortletTools.getPortletPreference(
@@ -76,10 +54,6 @@
"showLinkToOriginalBlog"));
}
- /**
- * @jmx.managed-operation
- * @jmx.managed-parameter type="java.lang.Object"
- */
public Boolean getShowLinkToOriginalPost(Object request) {
BasicTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
return Boolean.valueOf(PortletTools.getPortletPreference(
@@ -87,10 +61,6 @@
"showLinkToOriginalPost"));
}
- /**
- * @jmx.managed-operation
- * @jmx.managed-parameter type="java.lang.Object"
- */
public Boolean getLinkPostsToOriginal(Object request) {
BasicTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
return Boolean.valueOf(PortletTools.getPortletPreference(
@@ -98,10 +68,6 @@
"linkPostsToOriginal"));
}
- /**
- * @jmx.managed-operation
- * @jmx.managed-parameter type="java.lang.Object"
- */
public Map<String, String> getFeedLinks(Object request) {
BasicTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
String[] links = PortletTools.getPortletMultiPreference(
Modified: trunk/blog-services/src/java/org/jboss/blog/service/model/DelegatingModelService.java
===================================================================
--- trunk/blog-services/src/java/org/jboss/blog/service/model/DelegatingModelService.java 2007-06-21 12:05:41 UTC (rev 126)
+++ trunk/blog-services/src/java/org/jboss/blog/service/model/DelegatingModelService.java 2007-06-21 13:09:59 UTC (rev 127)
@@ -11,15 +11,9 @@
* depending on the blog name: it can be an URL to an external blog or an
* internal blog id and category.
* @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
- *
- * @jmx.mbean
- * @jboss.xmbean
*/
public class DelegatingModelService extends AbstractBlogService implements BlogModelService {
- /**
- * @jmx.managed-operation
- * @jmx.managed-parameter type="org.jboss.blog.BlogName"
- */
+
public BlogModel retrieveBlogModel(BlogName name) throws BlogModelDoesNotExistException {
if (BasicTools.isExternalLink(name.getId())) {
return externalDelegateModelService.retrieveBlogModel(name);
@@ -32,7 +26,6 @@
private BlogModelService internalDelegateModelService;
/**
- * @jmx.managed-attribute
* @return The external delegate model service.
*/
public BlogModelService getExternalDelegateModelService() {
@@ -40,7 +33,6 @@
}
/**
- * @jmx.managed-attribute
* @param externalDelegateModelService New external delegate model service.
*/
public void setExternalDelegateModelService(BlogModelService externalDelegateModelService) {
@@ -48,7 +40,6 @@
}
/**
- * @jmx.managed-attribute
* @return The internal delegate model service.
*/
public BlogModelService getInternalDelegateModelService() {
@@ -56,7 +47,6 @@
}
/**
- * @jmx.managed-attribute
* @param internalDelegateModelService New internal delegate model service.
*/
public void setInternalDelegateModelService(BlogModelService internalDelegateModelService) {
Modified: trunk/blog-services/src/java/org/jboss/blog/service/model/caching/CachingBlogModelService.java
===================================================================
--- trunk/blog-services/src/java/org/jboss/blog/service/model/caching/CachingBlogModelService.java 2007-06-21 12:05:41 UTC (rev 126)
+++ trunk/blog-services/src/java/org/jboss/blog/service/model/caching/CachingBlogModelService.java 2007-06-21 13:09:59 UTC (rev 127)
@@ -13,17 +13,6 @@
* A blog model service which caches models returned by another blog
* model model service to avoid, for example, unnecessary feed parsing.
* @author Adam Warski (adamw at aster.pl)
- *
- * @jmx.mbean
- * @jmx.managed-operation
- * name="start"
- * impact="ACTION"
- * return-type="void"
- * @jmx.managed-operation
- * name="stop"
- * impact="ACTION"
- * return-type="void"
- * @jboss.xmbean
*/
public class CachingBlogModelService extends AbstractBlogService implements BlogModelService {
private static Logger log = Logger.getLogger(CachingBlogModelService.class);
@@ -61,10 +50,6 @@
return new HashSet<BlogName>(locks.keySet());
}
- /**
- * @jmx.managed-operation
- * @jmx.managed-parameter type="org.jboss.blog.BlogName"
- */
public BlogModel retrieveBlogModel(BlogName name) throws BlogModelDoesNotExistException {
final BlogLock lock = getLock(name);
@@ -79,7 +64,6 @@
}
/**
- * @jmx.managed-attribute
* @return The delegate model service.
*/
public BlogModelService getDelegateModelService() {
@@ -87,7 +71,6 @@
}
/**
- * @jmx.managed-attribute
* @param delegateModelService New delegate model service.
*/
public void setDelegateModelService(BlogModelService delegateModelService) {
@@ -95,7 +78,6 @@
}
/**
- * @jmx.managed-attribute
* @return The update interval (time after which a blog model is renewed).
*/
public long getUpdateInterval() {
@@ -103,16 +85,12 @@
}
/**
- * @jmx.managed-attribute
* @param updateInterval New update interval.
*/
public void setUpdateInterval(long updateInterval) {
this.updateInterval = updateInterval;
}
- /**
- * @jmx.managed-operation
- */
public void startUpdateThread() {
updateThread = new Thread() {
public void run() {
@@ -155,9 +133,6 @@
log.info("Update thread started.");
}
- /**
- * @jmx.managed-operation
- */
public void stopUpdateThread() {
if (updateThread != null) {
updateThread.interrupt();
@@ -166,7 +141,6 @@
}
/**
- * @jmx.managed-operation
* @return A string description of all cached blog names.
*/
public String getAllCachedModels() {
Modified: trunk/blog-services/src/java/org/jboss/blog/service/model/rome/RomeParsingBlogModelService.java
===================================================================
--- trunk/blog-services/src/java/org/jboss/blog/service/model/rome/RomeParsingBlogModelService.java 2007-06-21 12:05:41 UTC (rev 126)
+++ trunk/blog-services/src/java/org/jboss/blog/service/model/rome/RomeParsingBlogModelService.java 2007-06-21 13:09:59 UTC (rev 127)
@@ -24,9 +24,6 @@
/**
* @author Adam Warski (adamw at aster.pl)
- *
- * @jmx.mbean
- * @jboss.xmbean
*/
public class RomeParsingBlogModelService extends AbstractBlogService implements BlogModelService {
public RomeParsingBlogModelService() {
@@ -60,10 +57,6 @@
return "";
}
- /**
- * @jmx.managed-operation
- * @jmx.managed-parameter type="org.jboss.blog.BlogName"
- */
@SuppressWarnings("unchecked")
public BlogModel retrieveBlogModel(BlogName name) throws BlogModelDoesNotExistException {
if (name == null) {
Modified: trunk/blog-services/src/java/org/jboss/blog/service/name/PortletPreferencesBlogNameService.java
===================================================================
--- trunk/blog-services/src/java/org/jboss/blog/service/name/PortletPreferencesBlogNameService.java 2007-06-21 12:05:41 UTC (rev 126)
+++ trunk/blog-services/src/java/org/jboss/blog/service/name/PortletPreferencesBlogNameService.java 2007-06-21 13:09:59 UTC (rev 127)
@@ -10,17 +10,6 @@
/**
* A name service which reads the blog name from portlet preferences.
* @author Adam Warski (adamw at aster.pl)
- *
- * @jmx.mbean
- * @jmx.managed-operation
- * name="start"
- * impact="ACTION"
- * return-type="void"
- * @jmx.managed-operation
- * name="stop"
- * impact="ACTION"
- * return-type="void"
- * @jboss.xmbean
*/
public class PortletPreferencesBlogNameService extends AbstractBlogService
implements BlogNameService {
@@ -33,10 +22,6 @@
}
- /**
- * @jmx.managed-operation
- * @jmx.managed-parameter type="java.lang.Object"
- */
public BlogName retrieveBlogName(Object request) {
BasicTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
Modified: trunk/blog-services/src/java/org/jboss/blog/service/permissions/DefaultBlogPermissionsService.java
===================================================================
--- trunk/blog-services/src/java/org/jboss/blog/service/permissions/DefaultBlogPermissionsService.java 2007-06-21 12:05:41 UTC (rev 126)
+++ trunk/blog-services/src/java/org/jboss/blog/service/permissions/DefaultBlogPermissionsService.java 2007-06-21 13:09:59 UTC (rev 127)
@@ -2,7 +2,11 @@
import org.jboss.blog.service.AbstractBlogService;
+/**
+ * @author Adam Warski (adamw at aster.pl)
+ */
public class DefaultBlogPermissionsService extends AbstractBlogService implements BlogPermissionsService {
+
public boolean hasAccess(SecurityContext context) {
return true;
}
Deleted: trunk/blog-view/blog-core.iml
===================================================================
--- trunk/blog-view/blog-core.iml 2007-06-21 12:05:41 UTC (rev 126)
+++ trunk/blog-view/blog-core.iml 2007-06-21 13:09:59 UTC (rev 127)
@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="J2EE_WEB_MODULE">
- <component name="AppServerSpecificValidatorsManager" />
- <component name="ModuleRootManager" />
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_4" inherit-compiler-output="true">
- <exclude-output />
- <exclude-exploded />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$APPLICATION_HOME_DIR$/lib/javaee.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="library" name="jsf" level="project" />
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/facelets/jsf-facelets-portlet.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/facelets/jsf-facelets.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/jboss/jboss-jmx.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/jboss/jboss-system.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/portlet/portlet-api-lib.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/rome/jdom-1.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="library" name="xdoclet" level="project" />
- <orderEntry type="module" module-name="blog-common" />
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/jboss-jaae/jboss-acl.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/jboss-jaae/jboss-identity-management.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/jboss-jaae/jboss-security-common.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/jboss-portal/portal-faces-lib.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/jboss-portal/portal-identity-lib.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/rome/rome-0.9.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntryProperties />
- </component>
- <component name="WebModuleBuildComponent">
- <setting name="EXPLODED_URL" value="file://" />
- <setting name="EXPLODED_ENABLED" value="false" />
- <setting name="JAR_URL" value="file://" />
- <setting name="JAR_ENABLED" value="false" />
- <setting name="SYNC_EXPLODED_DIR" value="true" />
- <setting name="BUILD_MODULE_ON_FRAME_DEACTIVATION" value="false" />
- <setting name="BUILD_EXTERNAL_DEPENDENCIES" value="false" />
- <setting name="RUN_JASPER_VALIDATION" value="true" />
- </component>
- <component name="WebModuleProperties">
- <containerElement type="module" name="blog-common">
- <attribute name="method" value="0" />
- <attribute name="URI" value="/WEB-INF/classes" />
- </containerElement>
- <containerElement type="module" name="blog-model">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/classes" />
- </containerElement>
- <containerElement type="library" level="module">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/jsf-facelets-portlet.jar" />
- <url>jar://$MODULE_DIR$/../lib/facelets/jsf-facelets-portlet.jar!/</url>
- </containerElement>
- <containerElement type="library" level="module">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/jsf-facelets.jar" />
- <url>jar://$MODULE_DIR$/../lib/facelets/jsf-facelets.jar!/</url>
- </containerElement>
- <containerElement type="library" level="module">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/jboss-acl.jar" />
- <url>jar://$MODULE_DIR$/../lib/jboss-jaae/jboss-acl.jar!/</url>
- </containerElement>
- <containerElement type="library" level="module">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/jboss-identity-management.jar" />
- <url>jar://$MODULE_DIR$/../lib/jboss-jaae/jboss-identity-management.jar!/</url>
- </containerElement>
- <containerElement type="library" level="module">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/jboss-security-common.jar" />
- <url>jar://$MODULE_DIR$/../lib/jboss-jaae/jboss-security-common.jar!/</url>
- </containerElement>
- <containerElement type="library" level="module">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/portal-faces-lib.jar" />
- <url>jar://$MODULE_DIR$/../lib/jboss-portal/portal-faces-lib.jar!/</url>
- </containerElement>
- <containerElement type="library" level="module">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/portal-identity-lib.jar" />
- <url>jar://$MODULE_DIR$/../lib/jboss-portal/portal-identity-lib.jar!/</url>
- </containerElement>
- <containerElement type="library" level="module">
- <attribute name="method" value="0" />
- <attribute name="URI" value="/WEB-INF/lib/jboss-j2ee.jar" />
- <url>jar://$MODULE_DIR$/../lib/jboss/jboss-j2ee.jar!/</url>
- </containerElement>
- <containerElement type="library" level="module">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/jboss-jmx.jar" />
- <url>jar://$MODULE_DIR$/../lib/jboss/jboss-jmx.jar!/</url>
- </containerElement>
- <containerElement type="library" level="module">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/jboss-system.jar" />
- <url>jar://$MODULE_DIR$/../lib/jboss/jboss-system.jar!/</url>
- </containerElement>
- <containerElement type="library" level="module">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/portlet-api-lib.jar" />
- <url>jar://$MODULE_DIR$/../lib/portlet/portlet-api-lib.jar!/</url>
- </containerElement>
- <containerElement type="library" level="module">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/jdom-1.0.jar" />
- <url>jar://$MODULE_DIR$/../lib/rome/jdom-1.0.jar!/</url>
- </containerElement>
- <containerElement type="library" level="module">
- <attribute name="method" value="0" />
- <attribute name="URI" value="/WEB-INF/lib/rome-0.9.jar" />
- <url>jar://$MODULE_DIR$/../lib/rome/rome-0.9.jar!/</url>
- </containerElement>
- <containerElement type="library" level="module">
- <attribute name="method" value="0" />
- <attribute name="URI" value="<N/A>" />
- <url>jar://$APPLICATION_HOME_DIR$/lib/javaee.jar!/</url>
- </containerElement>
- <containerElement type="library" name="jsf" level="project">
- <attribute name="method" value="0" />
- <attribute name="URI" value="<N/A>" />
- </containerElement>
- <containerElement type="library" name="xdoclet" level="project">
- <attribute name="method" value="0" />
- <attribute name="URI" value="/WEB-INF/lib" />
- </containerElement>
- <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/web/WEB-INF/web.xml" optional="false" version="2.3" />
- <webroots>
- <root url="file://$MODULE_DIR$/src/web" relative="/" />
- </webroots>
- </component>
- <component name="WeblogicWebModuleProperties" />
-</module>
-
Modified: trunk/blog-view/build.xml
===================================================================
--- trunk/blog-view/build.xml 2007-06-21 12:05:41 UTC (rev 126)
+++ trunk/blog-view/build.xml 2007-06-21 13:09:59 UTC (rev 127)
@@ -3,38 +3,21 @@
<project name="JBoss Blog View">
<!-- Classpath for building the application: includes all dependency jars -->
<path id="base.jars">
- <fileset refid="rome.jars" />
- <fileset refid="jboss.jars" />
- <fileset refid="jboss.portal.jars" />
<fileset refid="portlet.jars" />
<fileset refid="jstl.jars" />
- <fileset refid="servlet.jars" />
-
- <fileset refid="log4j.jar" />
+ <fileset refid="jboss.jars" />
</path>
- <!-- XDoclet task definition -->
- <path id="xdoclet.jars">
- <fileset dir="../lib/xdoclet"><include name="**/*.jar"/></fileset>
- </path>
-
- <taskdef name="jmxdoclet"
- classname="xdoclet.modules.jmx.JMXDocletTask"
- classpathref="xdoclet.jars"/>
- <taskdef name="hibernatedoclet"
- classname="xdoclet.modules.hibernate.HibernateDocletTask"
- classpathref="xdoclet.jars" />
-
<!-- BUILD TARGETS -->
<target name="init">
</target>
- <target name="copy-libs-for-servlet" unless="jboss.portal.present">
+ <!--<target name="copy-libs-for-servlet" unless="jboss.portal.present">
<copy todir="${dist.lib.dir}"><fileset refid="myfaces.jars"/></copy>
<copy todir="${dist.lib.dir}"><fileset refid="facelets.jars"/></copy>
- </target>
+ </target>-->
<target name="build">
<mkdir dir="${build}" />
@@ -50,23 +33,13 @@
<include name="**/*.xml"/>
</fileset>
</copy>
- <!-- Creating the xmbean xml-s -->
- <jmxdoclet destdir="${build}">
- <fileset dir="${src.java}"><include name="**/*.java"/></fileset>
- <jbossxmbean />
- </jmxdoclet>
</target>
<target name="dist">
<mkdir dir="${dist.lib.dir}" />
- <!-- Copying the meta information -->
- <copy todir="${dist.main.dir}">
- <fileset dir="${src.meta}"><include name="**/*" /></fileset>
- </copy>
-
<!-- Creating the jar with the classes -->
- <jar destfile="${dist.lib.dir}/jboss-blog-core.jar" basedir="${build}" />
+ <jar destfile="${dist.lib.dir}/jboss-blog-view.jar" basedir="${build}" />
<!-- Creating the web application -->
<mkdir dir="${dist.war.dir}" />
@@ -74,14 +47,9 @@
<fileset dir="${src.web}"><include name="**/*" /></fileset>
</copy>
- <!-- Copying dependency jars -->
- <copy todir="${dist.lib.dir}"><fileset refid="rome.jars"/></copy>
- <copy todir="${dist.lib.dir}"><fileset refid="jboss.portal.identity.jars"/></copy>
- <copy todir="${dist.lib.dir}"><fileset refid="jexl.jars"/></copy>
-
<copy todir="${dist.war.dir}/WEB-INF/lib"><fileset refid="jstl.jars"/></copy>
- <antcall target="copy-libs-for-servlet" />
+ <!--<antcall target="copy-libs-for-servlet" />-->
</target>
<target name="clean">
Modified: trunk/blog-view/src/web/WEB-INF/portlet-instances.xml
===================================================================
--- trunk/blog-view/src/web/WEB-INF/portlet-instances.xml 2007-06-21 12:05:41 UTC (rev 126)
+++ trunk/blog-view/src/web/WEB-INF/portlet-instances.xml 2007-06-21 13:09:59 UTC (rev 127)
@@ -28,7 +28,7 @@
</preference>
<preference>
<name>showLinkToOriginalPost</name>
- <value>true</value>
+ <value>false</value>
</preference>
<preference>
<name>linkPostsToOriginal</name>
Modified: trunk/blog-view/src/web/blog_view.jsp
===================================================================
--- trunk/blog-view/src/web/blog_view.jsp 2007-06-21 12:05:41 UTC (rev 126)
+++ trunk/blog-view/src/web/blog_view.jsp 2007-06-21 13:09:59 UTC (rev 127)
@@ -10,7 +10,7 @@
<h2>${blogView.blogModel.title}</h2>
-<c:if test="${not empty blogView.blogModel.link}">
+<c:if test="${not empty blogView.blogModel.link and blogView.showLinkToOriginalBlog}">
<p>
[ <a href="${blogView.blogModel.link}">View the original blog</a> ]
</p>
@@ -22,7 +22,7 @@
created on ${post.createdTime}, ${post.createdDate} by ${post.author.fullName}.
</p>
- <c:if test="${not empty post.link}">
+ <c:if test="${not empty post.link and blogView.showLinkToOriginalPost}">
<p>
[ <a href="${post.link}">View the original post</a> ]
</p>
Modified: trunk/blog-view/src/web/post_view.jsp
===================================================================
--- trunk/blog-view/src/web/post_view.jsp 2007-06-21 12:05:41 UTC (rev 126)
+++ trunk/blog-view/src/web/post_view.jsp 2007-06-21 13:09:59 UTC (rev 127)
@@ -14,7 +14,7 @@
<h2>${blogView.blogModel.title}</h2>
-<c:if test="${not empty blogView.blogModel.link}">
+<c:if test="${not empty blogView.blogModel.link and blogView.showLinkToOriginalBlog}">
<p>
[ <a href="${blogView.blogModel.link}">View the original blog</a> ]
</p>
@@ -25,7 +25,7 @@
created on ${blogView.selectedPost.createdTime}, ${blogView.selectedPost.createdDate} by ${blogView.selectedPost.author.fullName}.
</p>
-<c:if test="${not empty blogView.selectedPost.link}">
+<c:if test="${not empty blogView.selectedPost.link and blogView.showLinkToOriginalPost}">
<p>
[ <a href="${blogView.selectedPost.link}">View the original post</a> ]
</p>
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2007-06-21 12:05:41 UTC (rev 126)
+++ trunk/build.xml 2007-06-21 13:09:59 UTC (rev 127)
@@ -8,7 +8,7 @@
<property name="jboss.portal.present" value="true" />
<!-- Name of the service archive which will contain the blog application -->
- <property name="sar.name" value="jboss-blog.sar" />
+ <property name="sar.name" value="portal-blog.sar" />
<!-- Name of the web application that will be contained in the sar -->
<property name="war.name" value="jboss-blog.war" />
@@ -38,17 +38,22 @@
<fileset id="hibernate.jars" dir="lib/hibernate"><include name="**/*.jar"/></fileset>
<fileset id="servlet.jars" dir="lib/servlet"><include name="**/*.jar"/></fileset>
<fileset id="jexl.jars" dir="lib/jexl"><include name="**/*.jar"/></fileset>
+ <fileset id="log4j.jars" dir="lib/log4j"><include name="**/*.jar"/></fileset>
- <fileset id="log4j.jar" dir="lib/xdoclet"><include name="log4j.jar"/></fileset>
-
<fileset id="jboss.portal.identity.jars" dir="lib/jboss-portal">
<include name="**/portal-identity-lib.jar"/>
</fileset>
+
+ <fileset id="jboss.portal.jems.jars" dir="lib/jboss-portal">
+ <include name="**/portal-jems-lib.jar"/>
+ <include name="**/portal-common-lib.jar"/>
+ </fileset>
<!-- Helper tasks -->
<target name="each-module">
<ant dir="blog-common" inheritrefs="true" target="${target.name}" />
- <ant dir="blog-core" inheritrefs="true" target="${target.name}" />
+ <ant dir="blog-services" inheritrefs="true" target="${target.name}" />
+ <ant dir="blog-view" inheritrefs="true" target="${target.name}" />
</target>
<!-- Main tasks -->
Added: trunk/lib/jboss-portal/portal-common-lib.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/jboss-portal/portal-common-lib.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/lib/jboss-portal/portal-jems-lib.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/jboss-portal/portal-jems-lib.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/lib/log4j/log4j-1.2.9.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/log4j/log4j-1.2.9.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
More information about the jboss-cvs-commits
mailing list