Author: julien(a)jboss.com Date: 2007-04-07 18:58:18 -0400 (Sat, 07 Apr 2007) New Revision: 6949 Added: trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-renderSet.xml trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-themes.xml trunk/theme/src/resources/test/theme-test-war/file.txt trunk/theme/src/resources/test/theme-test-war/layouts/ trunk/theme/src/resources/test/theme-test-war/layouts/generic/ trunk/theme/src/resources/test/theme-test-war/themes/ trunk/theme/src/resources/test/theme-test-war/themes/style.css Removed: trunk/theme/src/bin/test/theme-test-war/WEB-INF/portal-layouts.xml trunk/theme/src/bin/test/theme-test-war/WEB-INF/portal-renderSet.xml trunk/theme/src/bin/test/theme-test-war/WEB-INF/portal-themes.xml trunk/theme/src/bin/test/theme-test-war/file.txt trunk/theme/src/bin/test/theme-test-war/jsunit/ trunk/theme/src/bin/test/theme-test-war/layouts/ trunk/theme/src/bin/test/theme-test-war/themes/ trunk/theme/src/resources/test/theme-test-war/layouts/generic/ trunk/theme/src/resources/test/theme-test-war/themes/style.css Log: merge theme-test-war that was spanning over bin and resource dirs Deleted: trunk/theme/src/bin/test/theme-test-war/WEB-INF/portal-layouts.xml =================================================================== --- trunk/theme/src/bin/test/theme-test-war/WEB-INF/portal-layouts.xml 2007-04-07 22:52:49 UTC (rev 6948) +++ trunk/theme/src/bin/test/theme-test-war/WEB-INF/portal-layouts.xml 2007-04-07 22:58:18 UTC (rev 6949) @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ~ JBoss, a division of Red Hat ~ - ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ - ~ contributors as indicated by the @authors tag. See the ~ - ~ copyright.txt in the distribution for a full listing of ~ - ~ individual contributors. ~ - ~ ~ - ~ This is free software; you can redistribute it and/or modify it ~ - ~ under the terms of the GNU Lesser General Public License as ~ - ~ published by the Free Software Foundation; either version 2.1 of ~ - ~ the License, or (at your option) any later version. ~ - ~ ~ - ~ This software is distributed in the hope that it will be useful, ~ - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ - ~ Lesser General Public License for more details. ~ - ~ ~ - ~ You should have received a copy of the GNU Lesser General Public ~ - ~ License along with this software; if not, write to the Free ~ - ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ - ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> - -<layouts> - <layout> - <name>generic</name> - <uri>/layouts/generic/index.jsp</uri> - <uri state="maximized">/layouts/generic/maximized.jsp</uri> - <regions> - <region name="left"/> - <region name="center"/> - <region name="navigation"/> - </regions> - </layout> -</layouts> Deleted: trunk/theme/src/bin/test/theme-test-war/WEB-INF/portal-renderSet.xml =================================================================== --- trunk/theme/src/bin/test/theme-test-war/WEB-INF/portal-renderSet.xml 2007-04-07 22:52:49 UTC (rev 6948) +++ trunk/theme/src/bin/test/theme-test-war/WEB-INF/portal-renderSet.xml 2007-04-07 22:58:18 UTC (rev 6949) @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ~ JBoss, a division of Red Hat ~ - ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ - ~ contributors as indicated by the @authors tag. See the ~ - ~ copyright.txt in the distribution for a full listing of ~ - ~ individual contributors. ~ - ~ ~ - ~ This is free software; you can redistribute it and/or modify it ~ - ~ under the terms of the GNU Lesser General Public License as ~ - ~ published by the Free Software Foundation; either version 2.1 of ~ - ~ the License, or (at your option) any later version. ~ - ~ ~ - ~ This software is distributed in the hope that it will be useful, ~ - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ - ~ Lesser General Public License for more details. ~ - ~ ~ - ~ You should have received a copy of the GNU Lesser General Public ~ - ~ License along with this software; if not, write to the Free ~ - ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ - ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> - -<portal-renderSet> - <renderSet name="divRenderer"> - <set content-type="text/html"> - <ajax-enabled>true</ajax-enabled> - <region-renderer>org.jboss.portal.theme.impl.render.div.DivRegionRenderer</region-renderer> - <window-renderer>org.jboss.portal.theme.impl.render.div.DivWindowRenderer</window-renderer> - <portlet-renderer>org.jboss.portal.theme.impl.render.div.DivPortletRenderer</portlet-renderer> - <decoration-renderer>org.jboss.portal.theme.impl.render.div.DivDecorationRenderer</decoration-renderer> - </set> - </renderSet> - <renderSet name="emptyRenderer"> - <set content-type="text/html"> - <ajax-enabled>true</ajax-enabled> - <region-renderer>org.jboss.portal.theme.impl.render.empty.EmptyRegionRenderer</region-renderer> - <window-renderer>org.jboss.portal.theme.impl.render.empty.EmptyWindowRenderer</window-renderer> - <portlet-renderer>org.jboss.portal.theme.impl.render.empty.EmptyPortletRenderer</portlet-renderer> - <decoration-renderer>org.jboss.portal.theme.impl.render.empty.EmptyDecorationRenderer</decoration-renderer> - </set> - </renderSet> - <renderSet name="testRenderer"> - <set content-type="text/html"> - <ajax-enabled>true</ajax-enabled> - <region-renderer>org.jboss.portal.test.theme.render.TestRegionRenderer</region-renderer> - <window-renderer>org.jboss.portal.test.theme.render.TestWindowRenderer</window-renderer> - <portlet-renderer>org.jboss.portal.test.theme.render.TestPortletRenderer</portlet-renderer> - <decoration-renderer>org.jboss.portal.test.theme.render.TestDecorationRenderer</decoration-renderer> - </set> - </renderSet> -</portal-renderSet> Deleted: trunk/theme/src/bin/test/theme-test-war/WEB-INF/portal-themes.xml =================================================================== --- trunk/theme/src/bin/test/theme-test-war/WEB-INF/portal-themes.xml 2007-04-07 22:52:49 UTC (rev 6948) +++ trunk/theme/src/bin/test/theme-test-war/WEB-INF/portal-themes.xml 2007-04-07 22:58:18 UTC (rev 6949) @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ~ JBoss, a division of Red Hat ~ - ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ - ~ contributors as indicated by the @authors tag. See the ~ - ~ copyright.txt in the distribution for a full listing of ~ - ~ individual contributors. ~ - ~ ~ - ~ This is free software; you can redistribute it and/or modify it ~ - ~ under the terms of the GNU Lesser General Public License as ~ - ~ published by the Free Software Foundation; either version 2.1 of ~ - ~ the License, or (at your option) any later version. ~ - ~ ~ - ~ This software is distributed in the hope that it will be useful, ~ - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ - ~ Lesser General Public License for more details. ~ - ~ ~ - ~ You should have received a copy of the GNU Lesser General Public ~ - ~ License along with this software; if not, write to the Free ~ - ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ - ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> - -<themes> - <theme> - <name>testTheme</name> - <link rel="stylesheet" id="main_css" href="/themes/style.css" type="text/css"/> - </theme> -</themes> \ No newline at end of file Deleted: trunk/theme/src/bin/test/theme-test-war/file.txt =================================================================== --- trunk/theme/src/bin/test/theme-test-war/file.txt 2007-04-07 22:52:49 UTC (rev 6948) +++ trunk/theme/src/bin/test/theme-test-war/file.txt 2007-04-07 22:58:18 UTC (rev 6949) @@ -1 +0,0 @@ -Content of the file Copied: trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-renderSet.xml (from rev 6941, trunk/theme/src/bin/test/theme-test-war/WEB-INF/portal-renderSet.xml) =================================================================== --- trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-renderSet.xml (rev 0) +++ trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-renderSet.xml 2007-04-07 22:58:18 UTC (rev 6949) @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ + ~ contributors as indicated by the @authors tag. See the ~ + ~ copyright.txt in the distribution for a full listing of ~ + ~ individual contributors. ~ + ~ ~ + ~ This is free software; you can redistribute it and/or modify it ~ + ~ under the terms of the GNU Lesser General Public License as ~ + ~ published by the Free Software Foundation; either version 2.1 of ~ + ~ the License, or (at your option) any later version. ~ + ~ ~ + ~ This software is distributed in the hope that it will be useful, ~ + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ + ~ Lesser General Public License for more details. ~ + ~ ~ + ~ You should have received a copy of the GNU Lesser General Public ~ + ~ License along with this software; if not, write to the Free ~ + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<portal-renderSet> + <renderSet name="divRenderer"> + <set content-type="text/html"> + <ajax-enabled>true</ajax-enabled> + <region-renderer>org.jboss.portal.theme.impl.render.div.DivRegionRenderer</region-renderer> + <window-renderer>org.jboss.portal.theme.impl.render.div.DivWindowRenderer</window-renderer> + <portlet-renderer>org.jboss.portal.theme.impl.render.div.DivPortletRenderer</portlet-renderer> + <decoration-renderer>org.jboss.portal.theme.impl.render.div.DivDecorationRenderer</decoration-renderer> + </set> + </renderSet> + <renderSet name="emptyRenderer"> + <set content-type="text/html"> + <ajax-enabled>true</ajax-enabled> + <region-renderer>org.jboss.portal.theme.impl.render.empty.EmptyRegionRenderer</region-renderer> + <window-renderer>org.jboss.portal.theme.impl.render.empty.EmptyWindowRenderer</window-renderer> + <portlet-renderer>org.jboss.portal.theme.impl.render.empty.EmptyPortletRenderer</portlet-renderer> + <decoration-renderer>org.jboss.portal.theme.impl.render.empty.EmptyDecorationRenderer</decoration-renderer> + </set> + </renderSet> + <renderSet name="testRenderer"> + <set content-type="text/html"> + <ajax-enabled>true</ajax-enabled> + <region-renderer>org.jboss.portal.test.theme.render.TestRegionRenderer</region-renderer> + <window-renderer>org.jboss.portal.test.theme.render.TestWindowRenderer</window-renderer> + <portlet-renderer>org.jboss.portal.test.theme.render.TestPortletRenderer</portlet-renderer> + <decoration-renderer>org.jboss.portal.test.theme.render.TestDecorationRenderer</decoration-renderer> + </set> + </renderSet> +</portal-renderSet> Copied: trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-themes.xml (from rev 6941, trunk/theme/src/bin/test/theme-test-war/WEB-INF/portal-themes.xml) =================================================================== --- trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-themes.xml (rev 0) +++ trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-themes.xml 2007-04-07 22:58:18 UTC (rev 6949) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ + ~ contributors as indicated by the @authors tag. See the ~ + ~ copyright.txt in the distribution for a full listing of ~ + ~ individual contributors. ~ + ~ ~ + ~ This is free software; you can redistribute it and/or modify it ~ + ~ under the terms of the GNU Lesser General Public License as ~ + ~ published by the Free Software Foundation; either version 2.1 of ~ + ~ the License, or (at your option) any later version. ~ + ~ ~ + ~ This software is distributed in the hope that it will be useful, ~ + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ + ~ Lesser General Public License for more details. ~ + ~ ~ + ~ You should have received a copy of the GNU Lesser General Public ~ + ~ License along with this software; if not, write to the Free ~ + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<themes> + <theme> + <name>testTheme</name> + <link rel="stylesheet" id="main_css" href="/themes/style.css" type="text/css"/> + </theme> +</themes> \ No newline at end of file Copied: trunk/theme/src/resources/test/theme-test-war/file.txt (from rev 6945, trunk/theme/src/bin/test/theme-test-war/file.txt) =================================================================== --- trunk/theme/src/resources/test/theme-test-war/file.txt (rev 0) +++ trunk/theme/src/resources/test/theme-test-war/file.txt 2007-04-07 22:58:18 UTC (rev 6949) @@ -0,0 +1 @@ +Content of the file Copied: trunk/theme/src/resources/test/theme-test-war/layouts (from rev 6941, trunk/theme/src/bin/test/theme-test-war/layouts) Copied: trunk/theme/src/resources/test/theme-test-war/layouts/generic (from rev 6948, trunk/theme/src/bin/test/theme-test-war/layouts/generic) Copied: trunk/theme/src/resources/test/theme-test-war/themes (from rev 6941, trunk/theme/src/bin/test/theme-test-war/themes) Deleted: trunk/theme/src/resources/test/theme-test-war/themes/style.css =================================================================== --- trunk/theme/src/bin/test/theme-test-war/themes/style.css 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/resources/test/theme-test-war/themes/style.css 2007-04-07 22:58:18 UTC (rev 6949) @@ -1,26 +0,0 @@ - -div.test-region { - border: 0px; - margin:16px; - width:512px; - padding:0px; - background-color:red; -} - -div.test-window { - border:1px solid black; - padding:15px; - background-color:blue; -} - -div.test-decoration { - border:1px solid black; - height:31px; - background-color:green; -} - -div.test-portlet { - border:1px solid black; - height:127px; - background-color:yellow; -} \ No newline at end of file Copied: trunk/theme/src/resources/test/theme-test-war/themes/style.css (from rev 6948, trunk/theme/src/bin/test/theme-test-war/themes/style.css) =================================================================== --- trunk/theme/src/resources/test/theme-test-war/themes/style.css (rev 0) +++ trunk/theme/src/resources/test/theme-test-war/themes/style.css 2007-04-07 22:58:18 UTC (rev 6949) @@ -0,0 +1,26 @@ + +div.test-region { + border: 0px; + margin:16px; + width:512px; + padding:0px; + background-color:red; +} + +div.test-window { + border:1px solid black; + padding:15px; + background-color:blue; +} + +div.test-decoration { + border:1px solid black; + height:31px; + background-color:green; +} + +div.test-portlet { + border:1px solid black; + height:127px; + background-color:yellow; +} \ No newline at end of file