Added: karaf/webconsole/trunk/karaf/feature/src/main/java/org/apache/karaf/webconsole/karaf/feature/repository/AddRepositoryPanel.java URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/karaf/feature/src/main/java/org/apache/karaf/webconsole/karaf/feature/repository/AddRepositoryPanel.java?rev=1242785&view=auto ============================================================================== --- karaf/webconsole/trunk/karaf/feature/src/main/java/org/apache/karaf/webconsole/karaf/feature/repository/AddRepositoryPanel.java (added) +++ karaf/webconsole/trunk/karaf/feature/src/main/java/org/apache/karaf/webconsole/karaf/feature/repository/AddRepositoryPanel.java Fri Feb 10 14:19:17 2012 @@ -0,0 +1,55 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.karaf.webconsole.karaf.feature.repository; + +import java.net.URI; + +import org.apache.karaf.features.FeaturesService; +import org.apache.karaf.features.Repository; +import org.apache.karaf.webconsole.core.form.LabelBorder; +import org.apache.wicket.markup.html.form.Form; +import org.apache.wicket.markup.html.form.TextField; +import org.apache.wicket.markup.html.panel.Panel; +import org.apache.wicket.model.CompoundPropertyModel; +import org.apache.wicket.model.IModel; +import org.apache.wicket.model.ResourceModel; +import org.ops4j.pax.wicket.api.PaxWicketBean; + +public class AddRepositoryPanel extends Panel { + + private static final long serialVersionUID = 1L; + + @PaxWicketBean(name = "featuresService") + private FeaturesService featuresService; + + private TextField<URI> uri; + + public AddRepositoryPanel(String id, IModel<Repository> model) { + super(id); + + Form<Repository> form = new Form<Repository>("add", new CompoundPropertyModel<Repository>(model)); + uri = new TextField<URI>("uri"); + uri.setRequired(true); + + LabelBorder border = new LabelBorder("border", new ResourceModel("feature.repository.uri"), uri); + border.setHelp(new ResourceModel("feature.repository.uri.help")); + form.add(border); + add(form); + } + + +}
Copied: karaf/webconsole/trunk/karaf/feature/src/main/java/org/apache/karaf/webconsole/karaf/feature/repository/RepositoriesActionPanel.java (from r1242784, karaf/webconsole/trunk/karaf/features/src/main/java/org/apache/karaf/webconsole/karaf/features/repository/RepositoriesActionPanel.java) URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/karaf/feature/src/main/java/org/apache/karaf/webconsole/karaf/feature/repository/RepositoriesActionPanel.java?p2=karaf/webconsole/trunk/karaf/feature/src/main/java/org/apache/karaf/webconsole/karaf/feature/repository/RepositoriesActionPanel.java&p1=karaf/webconsole/trunk/karaf/features/src/main/java/org/apache/karaf/webconsole/karaf/features/repository/RepositoriesActionPanel.java&r1=1242784&r2=1242785&rev=1242785&view=diff ============================================================================== --- karaf/webconsole/trunk/karaf/features/src/main/java/org/apache/karaf/webconsole/karaf/features/repository/RepositoriesActionPanel.java (original) +++ karaf/webconsole/trunk/karaf/feature/src/main/java/org/apache/karaf/webconsole/karaf/feature/repository/RepositoriesActionPanel.java Fri Feb 10 14:19:17 2012 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.karaf.webconsole.karaf.features.repository; +package org.apache.karaf.webconsole.karaf.feature.repository; import java.util.ArrayList; import java.util.List; Copied: karaf/webconsole/trunk/karaf/feature/src/main/java/org/apache/karaf/webconsole/karaf/feature/repository/RepositoriesPage.java (from r1242784, karaf/webconsole/trunk/karaf/features/src/main/java/org/apache/karaf/webconsole/karaf/features/repository/RepositoriesPage.java) URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/karaf/feature/src/main/java/org/apache/karaf/webconsole/karaf/feature/repository/RepositoriesPage.java?p2=karaf/webconsole/trunk/karaf/feature/src/main/java/org/apache/karaf/webconsole/karaf/feature/repository/RepositoriesPage.java&p1=karaf/webconsole/trunk/karaf/features/src/main/java/org/apache/karaf/webconsole/karaf/features/repository/RepositoriesPage.java&r1=1242784&r2=1242785&rev=1242785&view=diff ============================================================================== --- karaf/webconsole/trunk/karaf/features/src/main/java/org/apache/karaf/webconsole/karaf/features/repository/RepositoriesPage.java (original) +++ karaf/webconsole/trunk/karaf/feature/src/main/java/org/apache/karaf/webconsole/karaf/feature/repository/RepositoriesPage.java Fri Feb 10 14:19:17 2012 @@ -14,12 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.karaf.webconsole.karaf.features.repository; +package org.apache.karaf.webconsole.karaf.feature.repository; import org.apache.karaf.features.Repository; import org.apache.karaf.webconsole.core.table.OrdinalColumn; -import org.apache.karaf.webconsole.karaf.features.KarafFeaturesPage; -import org.apache.karaf.webconsole.karaf.features.RepositoriesProvider; +import org.apache.karaf.webconsole.karaf.feature.KarafFeaturesPage; +import org.apache.karaf.webconsole.karaf.feature.RepositoriesProvider; +import org.apache.wicket.RequestCycle; +import org.apache.wicket.ajax.AjaxRequestTarget; +import org.apache.wicket.ajax.markup.html.AjaxFallbackLink; import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator; import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn; import org.apache.wicket.extensions.markup.html.repeater.data.table.DefaultDataTable; @@ -46,6 +49,17 @@ public class RepositoriesPage extends Ka } }; + add(new AjaxFallbackLink("addRepository") { + @Override + public void onClick(AjaxRequestTarget target) { +// if (target != null) { +// target.addComponent(new AddRepositoryPanel(id, model)); +// } else { + RequestCycle.get().setResponsePage(AddRepositoryPage.class); +// } + } + }); + add(new DefaultDataTable<Repository>("repositories", columns, new RepositoriesProvider(featuresService), 20)); } Copied: karaf/webconsole/trunk/karaf/feature/src/main/java/org/apache/karaf/webconsole/karaf/feature/sidebar/KarafFeatureSidebar.java (from r1242784, karaf/webconsole/trunk/karaf/features/src/main/java/org/apache/karaf/webconsole/karaf/features/sidebar/KarafFeaturesSidebar.java) URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/karaf/feature/src/main/java/org/apache/karaf/webconsole/karaf/feature/sidebar/KarafFeatureSidebar.java?p2=karaf/webconsole/trunk/karaf/feature/src/main/java/org/apache/karaf/webconsole/karaf/feature/sidebar/KarafFeatureSidebar.java&p1=karaf/webconsole/trunk/karaf/features/src/main/java/org/apache/karaf/webconsole/karaf/features/sidebar/KarafFeaturesSidebar.java&r1=1242784&r2=1242785&rev=1242785&view=diff ============================================================================== --- karaf/webconsole/trunk/karaf/features/src/main/java/org/apache/karaf/webconsole/karaf/features/sidebar/KarafFeaturesSidebar.java (original) +++ karaf/webconsole/trunk/karaf/feature/src/main/java/org/apache/karaf/webconsole/karaf/feature/sidebar/KarafFeatureSidebar.java Fri Feb 10 14:19:17 2012 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.karaf.webconsole.karaf.features.sidebar; +package org.apache.karaf.webconsole.karaf.feature.sidebar; import static org.apache.karaf.webconsole.core.util.LinkUtils.createPageLink; @@ -24,16 +24,16 @@ import java.util.List; import org.apache.karaf.webconsole.core.navigation.SidebarProvider; import org.apache.karaf.webconsole.core.widget.WidgetProvider; -import org.apache.karaf.webconsole.karaf.features.feature.FeaturesPage; -import org.apache.karaf.webconsole.karaf.features.repository.AddRepositoryPage; -import org.apache.karaf.webconsole.karaf.features.repository.RepositoriesPage; +import org.apache.karaf.webconsole.karaf.feature.feature.FeaturesPage; +import org.apache.karaf.webconsole.karaf.feature.repository.AddRepositoryPage; +import org.apache.karaf.webconsole.karaf.feature.repository.RepositoriesPage; import org.apache.wicket.Page; import org.apache.wicket.markup.html.link.Link; /** * Karaf features sidebar. */ -public class KarafFeaturesSidebar implements SidebarProvider { +public class KarafFeatureSidebar implements SidebarProvider { @SuppressWarnings("unchecked") public List<Link<Page>> getItems(String componentId, String labelId) { Copied: karaf/webconsole/trunk/karaf/feature/src/main/java/org/apache/karaf/webconsole/karaf/feature/widget/FeatureWidgetPanel.java (from r1242784, karaf/webconsole/trunk/karaf/features/src/main/java/org/apache/karaf/webconsole/karaf/features/widget/FeaturesWidgetPanel.java) URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/karaf/feature/src/main/java/org/apache/karaf/webconsole/karaf/feature/widget/FeatureWidgetPanel.java?p2=karaf/webconsole/trunk/karaf/feature/src/main/java/org/apache/karaf/webconsole/karaf/feature/widget/FeatureWidgetPanel.java&p1=karaf/webconsole/trunk/karaf/features/src/main/java/org/apache/karaf/webconsole/karaf/features/widget/FeaturesWidgetPanel.java&r1=1242784&r2=1242785&rev=1242785&view=diff ============================================================================== --- karaf/webconsole/trunk/karaf/features/src/main/java/org/apache/karaf/webconsole/karaf/features/widget/FeaturesWidgetPanel.java (original) +++ karaf/webconsole/trunk/karaf/feature/src/main/java/org/apache/karaf/webconsole/karaf/feature/widget/FeatureWidgetPanel.java Fri Feb 10 14:19:17 2012 @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.karaf.webconsole.karaf.features.widget; +package org.apache.karaf.webconsole.karaf.feature.widget; import org.apache.karaf.features.Feature; import org.apache.karaf.features.FeaturesService; -import org.apache.karaf.webconsole.karaf.features.feature.FeaturesPage; -import org.apache.karaf.webconsole.karaf.features.repository.RepositoriesPage; +import org.apache.karaf.webconsole.karaf.feature.feature.FeaturesPage; +import org.apache.karaf.webconsole.karaf.feature.repository.RepositoriesPage; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.link.BookmarkablePageLink; import org.apache.wicket.markup.html.panel.Panel; -public class FeaturesWidgetPanel extends Panel { +public class FeatureWidgetPanel extends Panel { - public FeaturesWidgetPanel(String id, FeaturesService service) { + public FeatureWidgetPanel(String id, FeaturesService service) { super(id); try { Copied: karaf/webconsole/trunk/karaf/feature/src/main/java/org/apache/karaf/webconsole/karaf/feature/widget/KarafFeatureWidgetProvider.java (from r1242784, karaf/webconsole/trunk/karaf/features/src/main/java/org/apache/karaf/webconsole/karaf/features/widget/KarafFeaturesWidgetProvider.java) URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/karaf/feature/src/main/java/org/apache/karaf/webconsole/karaf/feature/widget/KarafFeatureWidgetProvider.java?p2=karaf/webconsole/trunk/karaf/feature/src/main/java/org/apache/karaf/webconsole/karaf/feature/widget/KarafFeatureWidgetProvider.java&p1=karaf/webconsole/trunk/karaf/features/src/main/java/org/apache/karaf/webconsole/karaf/features/widget/KarafFeaturesWidgetProvider.java&r1=1242784&r2=1242785&rev=1242785&view=diff ============================================================================== --- karaf/webconsole/trunk/karaf/features/src/main/java/org/apache/karaf/webconsole/karaf/features/widget/KarafFeaturesWidgetProvider.java (original) +++ karaf/webconsole/trunk/karaf/feature/src/main/java/org/apache/karaf/webconsole/karaf/feature/widget/KarafFeatureWidgetProvider.java Fri Feb 10 14:19:17 2012 @@ -14,22 +14,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.karaf.webconsole.karaf.features.widget; +package org.apache.karaf.webconsole.karaf.feature.widget; import org.apache.karaf.features.FeaturesService; import org.apache.karaf.webconsole.core.widget.WidgetProvider; import org.apache.wicket.markup.html.panel.Panel; -public class KarafFeaturesWidgetProvider implements WidgetProvider { +public class KarafFeatureWidgetProvider implements WidgetProvider { private final FeaturesService service; - public KarafFeaturesWidgetProvider(FeaturesService service) { + public KarafFeatureWidgetProvider(FeaturesService service) { this.service = service; } public Panel createPanel(String id) { - return new FeaturesWidgetPanel(id, service); + return new FeatureWidgetPanel(id, service); } } Copied: karaf/webconsole/trunk/karaf/feature/src/main/resources/OSGI-INF/blueprint/feature.xml (from r1242784, karaf/webconsole/trunk/karaf/features/src/main/resources/OSGI-INF/blueprint/features.xml) URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/karaf/feature/src/main/resources/OSGI-INF/blueprint/feature.xml?p2=karaf/webconsole/trunk/karaf/feature/src/main/resources/OSGI-INF/blueprint/feature.xml&p1=karaf/webconsole/trunk/karaf/features/src/main/resources/OSGI-INF/blueprint/features.xml&r1=1242784&r2=1242785&rev=1242785&view=diff ============================================================================== --- karaf/webconsole/trunk/karaf/features/src/main/resources/OSGI-INF/blueprint/features.xml (original) +++ karaf/webconsole/trunk/karaf/feature/src/main/resources/OSGI-INF/blueprint/feature.xml Fri Feb 10 14:19:17 2012 @@ -21,7 +21,7 @@ <service-properties> <entry key="extends" value="karaf" /> </service-properties> - <bean class="org.apache.karaf.webconsole.karaf.features.navigation.FeaturesNavigationProvider" /> + <bean class="org.apache.karaf.webconsole.karaf.feature.navigation.FeatureNavigationProvider" /> </service> <reference id="featuresService" interface="org.apache.karaf.features.FeaturesService"/> @@ -32,10 +32,10 @@ </service-properties> </service> - <bean id="widgetProvider" class="org.apache.karaf.webconsole.karaf.features.widget.KarafFeaturesWidgetProvider"> + <bean id="widgetProvider" class="org.apache.karaf.webconsole.karaf.feature.widget.KarafFeatureWidgetProvider"> <argument ref="featuresService" /> </bean> - <bean id="featuresSidebar" class="org.apache.karaf.webconsole.karaf.features.sidebar.KarafFeaturesSidebar" /> + <bean id="featuresSidebar" class="org.apache.karaf.webconsole.karaf.feature.sidebar.KarafFeatureSidebar" /> </blueprint> Added: karaf/webconsole/trunk/karaf/feature/src/main/resources/OSGI-INF/l10n/webconsole_pl.properties URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/karaf/feature/src/main/resources/OSGI-INF/l10n/webconsole_pl.properties?rev=1242785&view=auto ============================================================================== --- karaf/webconsole/trunk/karaf/feature/src/main/resources/OSGI-INF/l10n/webconsole_pl.properties (added) +++ karaf/webconsole/trunk/karaf/feature/src/main/resources/OSGI-INF/l10n/webconsole_pl.properties Fri Feb 10 14:19:17 2012 @@ -0,0 +1,3 @@ +feature.repository.uri URI Repozytorium +feature.repository.uri.help Mozesz okreslic URI repozytorium cech. Reposytorium to plik \ +xml ktory zawiera definicje jednostek wdrozenia. \ No newline at end of file Copied: karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/feature/FeaturesPage.html (from r1242784, karaf/webconsole/trunk/karaf/features/src/main/resources/org/apache/karaf/webconsole/karaf/features/feature/FeaturesPage.html) URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/feature/FeaturesPage.html?p2=karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/feature/FeaturesPage.html&p1=karaf/webconsole/trunk/karaf/features/src/main/resources/org/apache/karaf/webconsole/karaf/features/feature/FeaturesPage.html&r1=1242784&r2=1242785&rev=1242785&view=diff ============================================================================== (empty) Copied: karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/feature/FeaturesPage.properties (from r1242784, karaf/webconsole/trunk/karaf/features/src/main/resources/org/apache/karaf/webconsole/karaf/features/feature/FeaturesPage.properties) URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/feature/FeaturesPage.properties?p2=karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/feature/FeaturesPage.properties&p1=karaf/webconsole/trunk/karaf/features/src/main/resources/org/apache/karaf/webconsole/karaf/features/feature/FeaturesPage.properties&r1=1242784&r2=1242785&rev=1242785&view=diff ============================================================================== (empty) Copied: karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/feature/FeaturesPage_de.properties (from r1242784, karaf/webconsole/trunk/karaf/features/src/main/resources/org/apache/karaf/webconsole/karaf/features/feature/FeaturesPage_de.properties) URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/feature/FeaturesPage_de.properties?p2=karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/feature/FeaturesPage_de.properties&p1=karaf/webconsole/trunk/karaf/features/src/main/resources/org/apache/karaf/webconsole/karaf/features/feature/FeaturesPage_de.properties&r1=1242784&r2=1242785&rev=1242785&view=diff ============================================================================== (empty) Copied: karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/feature/FeaturesPage_fr.properties (from r1242784, karaf/webconsole/trunk/karaf/features/src/main/resources/org/apache/karaf/webconsole/karaf/features/feature/FeaturesPage_fr.properties) URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/feature/FeaturesPage_fr.properties?p2=karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/feature/FeaturesPage_fr.properties&p1=karaf/webconsole/trunk/karaf/features/src/main/resources/org/apache/karaf/webconsole/karaf/features/feature/FeaturesPage_fr.properties&r1=1242784&r2=1242785&rev=1242785&view=diff ============================================================================== (empty) Copied: karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/feature/features.css (from r1242784, karaf/webconsole/trunk/karaf/features/src/main/resources/org/apache/karaf/webconsole/karaf/features/feature/features.css) URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/feature/features.css?p2=karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/feature/features.css&p1=karaf/webconsole/trunk/karaf/features/src/main/resources/org/apache/karaf/webconsole/karaf/features/feature/features.css&r1=1242784&r2=1242785&rev=1242785&view=diff ============================================================================== (empty) Copied: karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/feature/images/feature_install.png (from r1242784, karaf/webconsole/trunk/karaf/features/src/main/resources/org/apache/karaf/webconsole/karaf/features/feature/images/feature_install.png) URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/feature/images/feature_install.png?p2=karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/feature/images/feature_install.png&p1=karaf/webconsole/trunk/karaf/features/src/main/resources/org/apache/karaf/webconsole/karaf/features/feature/images/feature_install.png&r1=1242784&r2=1242785&rev=1242785&view=diff ============================================================================== Binary files - no diff available. Copied: karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/feature/images/feature_uninstall.png (from r1242784, karaf/webconsole/trunk/karaf/features/src/main/resources/org/apache/karaf/webconsole/karaf/features/feature/images/feature_uninstall.png) URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/feature/images/feature_uninstall.png?p2=karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/feature/images/feature_uninstall.png&p1=karaf/webconsole/trunk/karaf/features/src/main/resources/org/apache/karaf/webconsole/karaf/features/feature/images/feature_uninstall.png&r1=1242784&r2=1242785&rev=1242785&view=diff ============================================================================== Binary files - no diff available. Copied: karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/navigation/package_fr.properties (from r1242784, karaf/webconsole/trunk/karaf/features/src/main/resources/org/apache/karaf/webconsole/karaf/features/navigation/package_fr.properties) URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/navigation/package_fr.properties?p2=karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/navigation/package_fr.properties&p1=karaf/webconsole/trunk/karaf/features/src/main/resources/org/apache/karaf/webconsole/karaf/features/navigation/package_fr.properties&r1=1242784&r2=1242785&rev=1242785&view=diff ============================================================================== (empty) Copied: karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/repository/AddRepositoryPage.html (from r1242784, karaf/webconsole/trunk/karaf/features/src/main/resources/org/apache/karaf/webconsole/karaf/features/repository/RepositoriesPage.html) URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/repository/AddRepositoryPage.html?p2=karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/repository/AddRepositoryPage.html&p1=karaf/webconsole/trunk/karaf/features/src/main/resources/org/apache/karaf/webconsole/karaf/features/repository/RepositoriesPage.html&r1=1242784&r2=1242785&rev=1242785&view=diff ============================================================================== --- karaf/webconsole/trunk/karaf/features/src/main/resources/org/apache/karaf/webconsole/karaf/features/repository/RepositoriesPage.html (original) +++ karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/repository/AddRepositoryPage.html Fri Feb 10 14:19:17 2012 @@ -15,16 +15,17 @@ See the License for the specific language governing permissions and limitations under the License. --> -<html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"; > - <wicket:head> - <title>Karaf WebConsole</title> - </wicket:head> +<wicket:extend xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd";> + <h1>Add feature repository</h1> - <body> - <wicket:extend> - <h1>Feature Repositories</h1> - <table wicket:id="repositories" class="table table-striped table-condensed"/> - </wicket:extend> - </body> + <form wicket:id="form"> -</html> + <div wicket:id="repository"></div> + + <div class="form-actions"> + <input type="submit" wicket:id="submit" class="btn btn-primary" value="Create" /> + <input type="reset" class="btn" value="Reset" /> + </div> + </form> + +</wicket:extend> \ No newline at end of file Added: karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/repository/AddRepositoryPage.properties URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/repository/AddRepositoryPage.properties?rev=1242785&view=auto ============================================================================== --- karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/repository/AddRepositoryPage.properties (added) +++ karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/repository/AddRepositoryPage.properties Fri Feb 10 14:19:17 2012 @@ -0,0 +1,3 @@ +feature.repository.uri Repository URI +feature.repository.uri.help You can specify an URI to feature repository. The \ +feature repository is XML file which contains definition of deployment units. \ No newline at end of file Copied: karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/repository/AddRepositoryPanel.html (from r1242784, karaf/webconsole/trunk/karaf/admin/src/main/resources/org/apache/karaf/webconsole/karaf/admin/list/InstancesPage.html) URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/repository/AddRepositoryPanel.html?p2=karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/repository/AddRepositoryPanel.html&p1=karaf/webconsole/trunk/karaf/admin/src/main/resources/org/apache/karaf/webconsole/karaf/admin/list/InstancesPage.html&r1=1242784&r2=1242785&rev=1242785&view=diff ============================================================================== --- karaf/webconsole/trunk/karaf/admin/src/main/resources/org/apache/karaf/webconsole/karaf/admin/list/InstancesPage.html (original) +++ karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/repository/AddRepositoryPanel.html Fri Feb 10 14:19:17 2012 @@ -15,17 +15,13 @@ See the License for the specific language governing permissions and limitations under the License. --> -<html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"; > - <wicket:head> - <title>Karaf WebConsole</title> - </wicket:head> - - <body> - <wicket:extend> - <h1>Instances</h1> - - <table wicket:id="instances" class="table table-striped table-condensed" /> - - </wicket:extend> - </body> -</html> +<wicket:panel xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd";> + <form wicket:id="add"> + <fieldset> + <legend>Feature details</legend> + <div class="control-group" wicket:id="border"> + <input type="text" class="input-xlarge" id="uri" wicket:id="uri" /> + </div> + </fieldset> + </form> +</wicket:panel> \ No newline at end of file Copied: karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/repository/RepositoriesPage.html (from r1242784, karaf/webconsole/trunk/karaf/admin/src/main/resources/org/apache/karaf/webconsole/karaf/admin/list/InstancesPage.html) URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/repository/RepositoriesPage.html?p2=karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/repository/RepositoriesPage.html&p1=karaf/webconsole/trunk/karaf/admin/src/main/resources/org/apache/karaf/webconsole/karaf/admin/list/InstancesPage.html&r1=1242784&r2=1242785&rev=1242785&view=diff ============================================================================== --- karaf/webconsole/trunk/karaf/admin/src/main/resources/org/apache/karaf/webconsole/karaf/admin/list/InstancesPage.html (original) +++ karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/repository/RepositoriesPage.html Fri Feb 10 14:19:17 2012 @@ -15,17 +15,19 @@ See the License for the specific language governing permissions and limitations under the License. --> -<html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"; > - <wicket:head> - <title>Karaf WebConsole</title> - </wicket:head> +<wicket:extend xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd";> - <body> - <wicket:extend> - <h1>Instances</h1> + <div class="row-fluid"> + <h1 class="pull-left">Feature Repositories</h1> - <table wicket:id="instances" class="table table-striped table-condensed" /> + <div class="pull-right"> + <a class="btn btn-primary" wicket:id="addRepository"> + <i class="icon-plus"></i> + Add repository + </a> + </div> + </div> - </wicket:extend> - </body> -</html> + <table wicket:id="repositories" class="table table-striped table-condensed"/> + +</wicket:extend> \ No newline at end of file Copied: karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/widget/FeatureWidgetPanel.html (from r1242784, karaf/webconsole/trunk/karaf/features/src/main/resources/org/apache/karaf/webconsole/karaf/features/feature/FeaturesPage.html) URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/widget/FeatureWidgetPanel.html?p2=karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/widget/FeatureWidgetPanel.html&p1=karaf/webconsole/trunk/karaf/features/src/main/resources/org/apache/karaf/webconsole/karaf/features/feature/FeaturesPage.html&r1=1242784&r2=1242785&rev=1242785&view=diff ============================================================================== --- karaf/webconsole/trunk/karaf/features/src/main/resources/org/apache/karaf/webconsole/karaf/features/feature/FeaturesPage.html (original) +++ karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/widget/FeatureWidgetPanel.html Fri Feb 10 14:19:17 2012 @@ -15,15 +15,18 @@ See the License for the specific language governing permissions and limitations under the License. --> -<html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd";> - <wicket:head> - <title>Karaf WebConsole</title> - </wicket:head> +<wicket:panel xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd";> + <div class="span3 widget"> + <h3>Karaf Features</h3> + <p> + You have <span wicket:id="featuresCount">10</span> features. + <span wicket:id="installedCount">10</span> installed and + <span wicket:id="uninstalledCount">10</span> waiting for installation. + </p> - <body> - <wicket:extend> - <h1>Features</h1> - <table wicket:id="features" class="table table-striped table-condensed"/> - </wicket:extend> - </body> -</html> + <p> + <a wicket:id="featuresLink">Go to feature management</a> + <a wicket:id="repositoriesLink">Go to repository management</a> + </p> + </div> +</wicket:panel> \ No newline at end of file Modified: karaf/webconsole/trunk/karaf/pom.xml URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/karaf/pom.xml?rev=1242785&r1=1242784&r2=1242785&view=diff ============================================================================== --- karaf/webconsole/trunk/karaf/pom.xml (original) +++ karaf/webconsole/trunk/karaf/pom.xml Fri Feb 10 14:19:17 2012 @@ -33,7 +33,7 @@ <modules> <module>core</module> <module>admin</module> - <module>features</module> + <module>feature</module> </modules> <dependencyManagement>
